50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
Index: linux-2.6.24.2/arch/mips/kernel/traps.c
|
|
===================================================================
|
|
--- linux-2.6.24.2.orig/arch/mips/kernel/traps.c
|
|
+++ linux-2.6.24.2/arch/mips/kernel/traps.c
|
|
@@ -42,6 +42,7 @@
|
|
#include <asm/mmu_context.h>
|
|
#include <asm/types.h>
|
|
#include <asm/stacktrace.h>
|
|
+#include <asm/time.h>
|
|
|
|
extern asmlinkage void handle_int(void);
|
|
extern asmlinkage void handle_tlbm(void);
|
|
@@ -1360,6 +1361,8 @@ void __init per_cpu_trap_init(void)
|
|
*/
|
|
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;
|
|
Index: linux-2.6.24.2/include/asm-mips/time.h
|
|
===================================================================
|
|
--- linux-2.6.24.2.orig/include/asm-mips/time.h
|
|
+++ linux-2.6.24.2/include/asm-mips/time.h
|
|
@@ -60,6 +60,7 @@ extern int (*perf_irq)(void);
|
|
#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)
|
|
{
|
|
Index: linux-2.6.24.2/arch/mips/atheros/board.c
|
|
===================================================================
|
|
--- linux-2.6.24.2.orig/arch/mips/atheros/board.c
|
|
+++ linux-2.6.24.2/arch/mips/atheros/board.c
|
|
@@ -205,6 +205,11 @@ void (*board_time_init)(void);
|
|
void __init plat_time_init(void) {
|
|
board_time_init();
|
|
}
|
|
+
|
|
+unsigned int __init get_c0_compare_irq(void)
|
|
+{
|
|
+ return CP0_LEGACY_COMPARE_IRQ;
|
|
+}
|
|
#endif
|
|
|
|
void __init arch_init_irq(void)
|