diff options
author | Ralph Hempel <ralph.hempel@lantiq.com> | 2010-04-25 09:50:33 +0000 |
---|---|---|
committer | Ralph Hempel <ralph.hempel@lantiq.com> | 2010-04-25 09:50:33 +0000 |
commit | 8e143d06bfb1af22e9d68bbaa069914c5da7712b (patch) | |
tree | 26aff495b35068e194c7c98a06e117967890a4b9 /target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch | |
parent | f320d49d011574a43c31c945fdddb2b75a8aabe4 (diff) | |
download | upstream-8e143d06bfb1af22e9d68bbaa069914c5da7712b.tar.gz upstream-8e143d06bfb1af22e9d68bbaa069914c5da7712b.tar.bz2 upstream-8e143d06bfb1af22e9d68bbaa069914c5da7712b.zip |
refresh .32 platform patches
SVN-Revision: 21155
Diffstat (limited to 'target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch')
-rw-r--r-- | target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch index bd1b399c12..ad3fe9fb32 100644 --- a/target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch +++ b/target/linux/ifxmips/patches-2.6.32/000-mips-bad-intctl.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.30.5/arch/mips/kernel/traps.c -=================================================================== ---- linux-2.6.30.5.orig/arch/mips/kernel/traps.c 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/arch/mips/kernel/traps.c 2009-09-02 18:23:37.000000000 +0200 -@@ -1542,7 +1542,16 @@ +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c +@@ -1537,7 +1537,16 @@ void __cpuinit per_cpu_trap_init(void) */ if (cpu_has_mips_r2) { cp0_compare_irq = (read_c0_intctl() >> 29) & 7; @@ -19,11 +17,9 @@ Index: linux-2.6.30.5/arch/mips/kernel/traps.c if (cp0_perfcount_irq == cp0_compare_irq) cp0_perfcount_irq = -1; } else { -Index: linux-2.6.30.5/arch/mips/include/asm/irq.h -=================================================================== ---- linux-2.6.30.5.orig/arch/mips/include/asm/irq.h 2009-09-02 18:24:49.000000000 +0200 -+++ linux-2.6.30.5/arch/mips/include/asm/irq.h 2009-09-02 18:26:05.000000000 +0200 -@@ -157,8 +157,10 @@ +--- a/arch/mips/include/asm/irq.h ++++ b/arch/mips/include/asm/irq.h +@@ -158,8 +158,10 @@ extern void free_irqno(unsigned int irq) * IE7. Since R2 their number has to be read from the c0_intctl register. */ #define CP0_LEGACY_COMPARE_IRQ 7 |