diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2010-03-14 13:22:38 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2010-03-14 13:22:38 +0000 |
commit | 783de93464a209d4796ebec02b20a31e5bc99058 (patch) | |
tree | 023486e2aade74fb7974676622c1aa831132de23 /target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch | |
parent | 14e104688dc12c855d8fe1df550174557505c185 (diff) | |
download | upstream-783de93464a209d4796ebec02b20a31e5bc99058.tar.gz upstream-783de93464a209d4796ebec02b20a31e5bc99058.tar.bz2 upstream-783de93464a209d4796ebec02b20a31e5bc99058.zip |
atheros: refresh 2.6.32 patches
SVN-Revision: 20197
Diffstat (limited to 'target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch')
-rw-r--r-- | target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch b/target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch index 3f9970f990..894eed1e5b 100644 --- a/target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch +++ b/target/linux/atheros/patches-2.6.32/002-mips_clocksource_init_war.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.32.7/arch/mips/kernel/cevt-r4k.c -=================================================================== ---- linux-2.6.32.7.orig/arch/mips/kernel/cevt-r4k.c 2010-02-03 16:59:28.310430064 +0100 -+++ linux-2.6.32.7/arch/mips/kernel/cevt-r4k.c 2010-02-03 16:59:54.578430015 +0100 +--- a/arch/mips/kernel/cevt-r4k.c ++++ b/arch/mips/kernel/cevt-r4k.c @@ -16,6 +16,22 @@ #include <asm/cevt-r4k.h> @@ -25,7 +23,7 @@ Index: linux-2.6.32.7/arch/mips/kernel/cevt-r4k.c * The SMTC Kernel for the 34K, 1004K, et. al. replaces several * of these routines with SMTC-specific variants. */ -@@ -31,6 +47,7 @@ +@@ -31,6 +47,7 @@ static int mips_next_event(unsigned long cnt = read_c0_count(); cnt += delta; write_c0_compare(cnt); @@ -33,7 +31,7 @@ Index: linux-2.6.32.7/arch/mips/kernel/cevt-r4k.c res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0; return res; } -@@ -100,22 +117,6 @@ +@@ -100,22 +117,6 @@ static int c0_compare_int_pending(void) return (read_c0_cause() >> cp0_compare_irq) & 0x100; } |