mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-30 22:49:43 +02:00
d3e1822b67
Signed-off-by: Daniel Golle <dgolle@allnet.de> create mode 100644 target/linux/ramips/patches-3.6/001-mips-add-cp0-compare-irq-function.patch create mode 100644 target/linux/ramips/patches-3.6/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch create mode 100644 target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch create mode 100644 target/linux/ramips/patches-3.6/100-mips-ralink-core.patch create mode 100644 target/linux/ramips/patches-3.6/101-rt288x_serial_driver_hack.patch create mode 100644 target/linux/ramips/patches-3.6/102-rt288x-pci-driver-hook.patch create mode 100644 target/linux/ramips/patches-3.6/103-ethernet.patch create mode 100644 target/linux/ramips/patches-3.6/104-ramips-watchdog-driver.patch create mode 100644 target/linux/ramips/patches-3.6/105-ramips-spi-driver.patch create mode 100644 target/linux/ramips/patches-3.6/105-usb_dwc_otg.patch create mode 100644 target/linux/ramips/patches-3.6/106-rt3883-pci-support.patch create mode 100644 target/linux/ramips/patches-3.6/200-rt3883-ehci-glue.patch create mode 100644 target/linux/ramips/patches-3.6/201-rt3883-ohci-glue.patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34108 3c298f89-4303-0410-b956-a3cf2f4a3e73
30 lines
967 B
Diff
30 lines
967 B
Diff
--- a/arch/mips/kernel/traps.c
|
|
+++ b/arch/mips/kernel/traps.c
|
|
@@ -54,6 +54,7 @@
|
|
#include <asm/types.h>
|
|
#include <asm/stacktrace.h>
|
|
#include <asm/uasm.h>
|
|
+#include <asm/time.h>
|
|
|
|
extern void check_wait(void);
|
|
extern asmlinkage void r4k_wait(void);
|
|
@@ -1598,6 +1599,8 @@ void __cpuinit per_cpu_trap_init(bool is
|
|
if (cpu_has_mips_r2) {
|
|
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
|
|
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
|
|
+ if (get_c0_compare_irq)
|
|
+ cp0_compare_irq = get_c0_compare_irq();
|
|
cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
|
|
if (cp0_perfcount_irq == cp0_compare_irq)
|
|
cp0_perfcount_irq = -1;
|
|
--- 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);
|
|
+extern unsigned int __weak get_c0_compare_irq(void);
|
|
extern int r4k_clockevent_init(void);
|
|
#endif
|
|
|