diff options
author | David Daney <ddaney@caviumnetworks.com> | 2010-04-06 16:29:50 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-04-12 12:26:22 -0400 |
commit | f6be75d03c8870be91e6e2a195648ece04b6bb16 (patch) | |
tree | eba85c44498f040ac07915d82467aa08bb426860 /arch/mips/kernel | |
parent | d8000beef2cd10c16dc5f66af715f692f5992652 (diff) |
MIPS: Calculate proper ebase value for 64-bit kernels
The ebase is relative to CKSEG0 not CAC_BASE. On a 32-bit kernel they
are the same thing, for a 64-bit kernel they are not.
It happens to kind of work on a 64-bit kernel as they both reference
the same physical memory. However since the CPU uses the CKSEG0 base,
determining if a J instruction will reach always gives the wrong result
unless we use the same number the CPU uses.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1093/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 4e00f9bc23ee..1a4dd657ccb9 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -1599,7 +1599,7 @@ void __init trap_init(void) | |||
1599 | ebase = (unsigned long) | 1599 | ebase = (unsigned long) |
1600 | __alloc_bootmem(size, 1 << fls(size), 0); | 1600 | __alloc_bootmem(size, 1 << fls(size), 0); |
1601 | } else { | 1601 | } else { |
1602 | ebase = CAC_BASE; | 1602 | ebase = CKSEG0; |
1603 | if (cpu_has_mips_r2) | 1603 | if (cpu_has_mips_r2) |
1604 | ebase += (read_c0_ebase() & 0x3ffff000); | 1604 | ebase += (read_c0_ebase() & 0x3ffff000); |
1605 | } | 1605 | } |