diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-03-03 09:40:17 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-03-03 09:40:17 +0000 |
| commit | 58ec1289d9dfdb8dde4761e4e3c42c9c4bc140e7 (patch) | |
| tree | c4e6e254251ef1832c686264d05afb412eaaa86f /target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch | |
| parent | 111ae3e04b422caf594e78bdcb291fcfebd242b1 (diff) | |
| download | master-31e0f0ae-58ec1289d9dfdb8dde4761e4e3c42c9c4bc140e7.tar.gz master-31e0f0ae-58ec1289d9dfdb8dde4761e4e3c42c9c4bc140e7.tar.bz2 master-31e0f0ae-58ec1289d9dfdb8dde4761e4e3c42c9c4bc140e7.zip | |
ar71xx: refresh 2.6.33 patches
SVN-Revision: 19960
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch index e6c45e50af..596e6697e7 100644 --- a/target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch +++ b/target/linux/ar71xx/patches-2.6.33/901-get_c0_compare_irq_function.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.33/arch/mips/kernel/traps.c -=================================================================== ---- linux-2.6.33.orig/arch/mips/kernel/traps.c 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/mips/kernel/traps.c 2010-02-28 16:51:35.397204241 +0100 +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c @@ -50,6 +50,7 @@ #include <asm/types.h> #include <asm/stacktrace.h> @@ -10,7 +8,7 @@ Index: linux-2.6.33/arch/mips/kernel/traps.c extern void check_wait(void); extern asmlinkage void r4k_wait(void); -@@ -1496,6 +1497,8 @@ +@@ -1496,6 +1497,8 @@ 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; @@ -19,11 +17,9 @@ Index: linux-2.6.33/arch/mips/kernel/traps.c cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7; if (cp0_perfcount_irq == cp0_compare_irq) cp0_perfcount_irq = -1; -Index: linux-2.6.33/arch/mips/include/asm/time.h -=================================================================== ---- linux-2.6.33.orig/arch/mips/include/asm/time.h 2010-02-24 19:52:17.000000000 +0100 -+++ linux-2.6.33/arch/mips/include/asm/time.h 2010-02-28 16:49:18.925959821 +0100 -@@ -52,6 +52,7 @@ +--- a/arch/mips/include/asm/time.h ++++ b/arch/mips/include/asm/time.h +@@ -52,6 +52,7 @@ extern int (*perf_irq)(void); */ #ifdef CONFIG_CEVT_R4K_LIB extern unsigned int __weak get_c0_compare_int(void); |