diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-04-29 16:19:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-04-29 16:19:36 +0000 |
commit | 797927ebec0f439ca69cd641f087b5115048d880 (patch) | |
tree | b60a81386d97c9e33dfd011f812e5102bfdd94aa /target/linux/atheros | |
parent | ee93382886c822b4b0e6b794963994312aa0018e (diff) | |
download | upstream-797927ebec0f439ca69cd641f087b5115048d880.tar.gz upstream-797927ebec0f439ca69cd641f087b5115048d880.tar.bz2 upstream-797927ebec0f439ca69cd641f087b5115048d880.zip |
atheros: remove useless get_c0_compare_int fix
Remove get_c0_compare_int fix which is useless for latest kernels.
Tested on Ubnt Bullet2, which could successfully boot without this
workaround.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40593 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros')
-rw-r--r-- | target/linux/atheros/patches-3.10/001-get_c0_compare_int_fix.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/atheros/patches-3.10/001-get_c0_compare_int_fix.patch b/target/linux/atheros/patches-3.10/001-get_c0_compare_int_fix.patch deleted file mode 100644 index d0907733cb..0000000000 --- a/target/linux/atheros/patches-3.10/001-get_c0_compare_int_fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix the usage of get_c0_compare_int: override cp0_compare_irq if the returned -value is in the MIPS CPU IRQ range to ensure that c0_compare_int_usable() -still works. - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> - ---- a/arch/mips/kernel/cevt-r4k.c -+++ b/arch/mips/kernel/cevt-r4k.c -@@ -177,20 +177,23 @@ int __cpuinit r4k_clockevent_init(void) - struct clock_event_device *cd; - unsigned int irq; - -- if (!cpu_has_counter || !mips_hpt_frequency) -- return -ENXIO; -- -- if (!c0_compare_int_usable()) -- return -ENXIO; -- - /* - * With vectored interrupts things are getting platform specific. - * get_c0_compare_int is a hook to allow a platform to return the - * interrupt number of it's liking. - */ - irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq; -- if (get_c0_compare_int) -+ if (get_c0_compare_int) { - irq = get_c0_compare_int(); -+ if ((irq >= MIPS_CPU_IRQ_BASE) && (irq < MIPS_CPU_IRQ_BASE + 8)) -+ cp0_compare_irq = irq - MIPS_CPU_IRQ_BASE; -+ } -+ -+ if (!cpu_has_counter || !mips_hpt_frequency) -+ return -ENXIO; -+ -+ if (!c0_compare_int_usable()) -+ return -ENXIO; - - cd = &per_cpu(mips_clockevent_device, cpu); - |