--- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -54,6 +54,7 @@ #include #include #include +#include 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 ue='barrier_breaker'>barrier_breaker upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
blob: c8b07500b39e975e9dd499e9337d8f56712d366a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60