aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-04-22 07:12:09 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-04-22 07:12:09 +0000
commita0a67ed36661e2252b635e8eb2e2debaa7f2c791 (patch)
tree0c7e52610b4ffe5971af3fcc7e40d0bb8197cd73 /target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch
parent934a7884541a41513d9b168fa342ba2d8295b001 (diff)
downloadupstream-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.tar.gz
upstream-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.tar.bz2
upstream-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.zip
kernel: refresh patches for 2.6.33.2, and drop md5sum for older 2.6.32 kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21081 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch')
-rw-r--r--target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch16
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch
index efecbf1f75..7c0f52db06 100644
--- a/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch
+++ b/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.33.2/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.33.2.orig/arch/mips/kernel/traps.c 2010-04-02 01:02:33.000000000 +0200
-+++ linux-2.6.33.2/arch/mips/kernel/traps.c 2010-04-02 23:36:16.000000000 +0200
-@@ -1496,7 +1496,18 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1496,7 +1496,18 @@ void __cpuinit per_cpu_trap_init(void)
if (cpu_has_mips_r2) {
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
@@ -21,11 +19,9 @@ Index: linux-2.6.33.2/arch/mips/kernel/traps.c
if (cp0_perfcount_irq == cp0_compare_irq)
cp0_perfcount_irq = -1;
} else {
-Index: linux-2.6.33.2/arch/mips/include/asm/irq.h
-===================================================================
---- linux-2.6.33.2.orig/arch/mips/include/asm/irq.h 2010-04-02 01:02:33.000000000 +0200
-+++ linux-2.6.33.2/arch/mips/include/asm/irq.h 2010-04-02 23:37:14.000000000 +0200
-@@ -133,9 +133,11 @@
+--- a/arch/mips/include/asm/irq.h
++++ b/arch/mips/include/asm/irq.h
+@@ -133,9 +133,11 @@ 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