diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 14:49:37 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 14:49:37 +0900 |
commit | 028c5d5d596651bce13d06737eb3707a7e99a30c (patch) | |
tree | e4e429858a19635ad2b5aa563bf1b4e39396d4e2 /arch/mips/kernel | |
parent | 19f6b8b44e3f633d5d7d1ed68848b1eb89a1e800 (diff) | |
parent | 4b505db9c4c72dbd2a8e66b8d681640101325af6 (diff) |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/traps.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 9c187a64649..758ad426c57 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -287,9 +287,9 @@ static inline int __cpu_has_fpu(void) static inline void cpu_probe_vmbits(struct cpuinfo_mips *c) { #ifdef __NEED_VMBITS_PROBE - write_c0_entryhi(0x3ffffffffffff000ULL); + write_c0_entryhi(0x3fffffffffffe000ULL); back_to_back_c0_hazard(); - c->vmbits = fls64(read_c0_entryhi() & 0x3ffffffffffff000ULL); + c->vmbits = fls64(read_c0_entryhi() & 0x3fffffffffffe000ULL); #endif } diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 338dfe8ed00..31b204b26ba 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -1501,6 +1501,7 @@ void __cpuinit per_cpu_trap_init(void) cp0_perfcount_irq = -1; } else { cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ; + cp0_compare_irq_shift = cp0_compare_irq; cp0_perfcount_irq = -1; } |