diff options
| author | David Daney <ddaney@caviumnetworks.com> | 2010-02-08 12:27:00 -0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-10 22:15:46 +0100 |
| commit | 5b7efa898b357e6ebe4024c520e62024eb969b5f (patch) | |
| tree | 9e16176be11ca256b501b7aaf945af3e08a4b540 /arch/mips/kernel | |
| parent | c2d5b5e525a354987b9c3de3661133f982bf9ba0 (diff) | |
| download | kernel_samsung_aries-5b7efa898b357e6ebe4024c520e62024eb969b5f.zip kernel_samsung_aries-5b7efa898b357e6ebe4024c520e62024eb969b5f.tar.gz kernel_samsung_aries-5b7efa898b357e6ebe4024c520e62024eb969b5f.tar.bz2 | |
MIPS: Don't probe reserved EntryHi bits.
The patch that adds cpu_probe_vmbits is erroneously writing to reserved
bit 12. Since we are really only probing high bits, don't write this bit
with a one.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Patchwork: http://patchwork.linux-mips.org/patch/949/
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 9c187a6..758ad42 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 } |