From: Felix Fietkau Date: Tue, 29 Apr 2014 16:19:36 +0000 (+0000) Subject: atheros: remove useless get_c0_compare_int fix X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a12ad3ecf14089a5090c927896ad2e80cd6ed255;p=openwrt%2Fstaging%2Frmilecki.git 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 SVN-Revision: 40593 --- 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 d0907733cb5..00000000000 --- 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 - ---- 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); -