diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-15 14:05:32 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-15 14:05:32 +0000 |
| commit | c8d95b6e974ea29785e510cd4b3c2da234ac516f (patch) | |
| tree | 7e7577498cab7838cf9bf9b5eeca2a68b4464abc /target/linux/atheros/patches-2.6.36/001-get_c0_compare_int_fix.patch | |
| parent | 34a56d15af7e843136d397c71934fc59131334a4 (diff) | |
linux/atheros: add preliminary 2.6.36 kernel support (refresh patches)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23454 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.36/001-get_c0_compare_int_fix.patch')
| -rw-r--r-- | target/linux/atheros/patches-2.6.36/001-get_c0_compare_int_fix.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-2.6.36/001-get_c0_compare_int_fix.patch b/target/linux/atheros/patches-2.6.36/001-get_c0_compare_int_fix.patch new file mode 100644 index 000000000..0f6873ddc --- /dev/null +++ b/target/linux/atheros/patches-2.6.36/001-get_c0_compare_int_fix.patch @@ -0,0 +1,39 @@ +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 +@@ -167,20 +167,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); + |