mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-10-30 09:06:16 +02:00
eecd8cc2a3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12932 3c298f89-4303-0410-b956-a3cf2f4a3e73
44 lines
1.1 KiB
Diff
44 lines
1.1 KiB
Diff
--- a/arch/mips/kernel/traps.c
|
|
+++ b/arch/mips/kernel/traps.c
|
|
@@ -45,6 +45,7 @@
|
|
#include <asm/mmu_context.h>
|
|
#include <asm/types.h>
|
|
#include <asm/stacktrace.h>
|
|
+#include <asm/time.h>
|
|
|
|
extern void check_wait(void);
|
|
extern asmlinkage void r4k_wait(void);
|
|
@@ -1484,6 +1485,8 @@
|
|
*/
|
|
if (cpu_has_mips_r2) {
|
|
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
|
|
+ if (get_c0_compare_irq)
|
|
+ cp0_compare_irq = get_c0_compare_irq();
|
|
cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
|
|
if (cp0_perfcount_irq == cp0_compare_irq)
|
|
cp0_perfcount_irq = -1;
|
|
--- a/include/asm-mips/time.h
|
|
+++ b/include/asm-mips/time.h
|
|
@@ -53,6 +53,7 @@
|
|
#ifdef CONFIG_CEVT_R4K
|
|
extern int mips_clockevent_init(void);
|
|
extern unsigned int __weak get_c0_compare_int(void);
|
|
+extern unsigned int __weak get_c0_compare_irq(void);
|
|
#else
|
|
static inline int mips_clockevent_init(void)
|
|
{
|
|
--- a/arch/mips/atheros/board.c
|
|
+++ b/arch/mips/atheros/board.c
|
|
@@ -205,6 +205,11 @@
|
|
void __init plat_time_init(void) {
|
|
board_time_init();
|
|
}
|
|
+
|
|
+unsigned int __cpuinit get_c0_compare_irq(void)
|
|
+{
|
|
+ return CP0_LEGACY_COMPARE_IRQ;
|
|
+}
|
|
#endif
|
|
|
|
void __init arch_init_irq(void)
|