diff options
author | David Daney <david.daney@cavium.com> | 2014-05-28 17:52:08 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-05-30 15:01:10 -0400 |
commit | 35d0470668cca234e49ed35342b3f9a0eec8355c (patch) | |
tree | 5d9de01e959993d1c5fe0167a1701a13a23ae26a /arch/mips | |
parent | a68d09a156b2a543117bb98df4c8c4cd1b857124 (diff) |
MIPS: Don't build fast TLB refill handler with 32-bit kernels
The fast handler only supports 64-bit kernels.
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
Cc: linux-mips@linux-mips.org
Cc: James Hogan <james.hogan@imgtec.com>
Cc: kvm@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7010/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/mm/tlbex.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index f99ec587b151..af91f3ed1a82 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -1250,13 +1250,17 @@ static void build_r4000_tlb_refill_handler(void) | |||
1250 | unsigned int final_len; | 1250 | unsigned int final_len; |
1251 | struct mips_huge_tlb_info htlb_info __maybe_unused; | 1251 | struct mips_huge_tlb_info htlb_info __maybe_unused; |
1252 | enum vmalloc64_mode vmalloc_mode __maybe_unused; | 1252 | enum vmalloc64_mode vmalloc_mode __maybe_unused; |
1253 | 1253 | #ifdef CONFIG_64BIT | |
1254 | bool is64bit = true; | ||
1255 | #else | ||
1256 | bool is64bit = false; | ||
1257 | #endif | ||
1254 | memset(tlb_handler, 0, sizeof(tlb_handler)); | 1258 | memset(tlb_handler, 0, sizeof(tlb_handler)); |
1255 | memset(labels, 0, sizeof(labels)); | 1259 | memset(labels, 0, sizeof(labels)); |
1256 | memset(relocs, 0, sizeof(relocs)); | 1260 | memset(relocs, 0, sizeof(relocs)); |
1257 | memset(final_handler, 0, sizeof(final_handler)); | 1261 | memset(final_handler, 0, sizeof(final_handler)); |
1258 | 1262 | ||
1259 | if ((scratch_reg >= 0 || scratchpad_available()) && use_bbit_insns()) { | 1263 | if (is64bit && (scratch_reg >= 0 || scratchpad_available()) && use_bbit_insns()) { |
1260 | htlb_info = build_fast_tlb_refill_handler(&p, &l, &r, K0, K1, | 1264 | htlb_info = build_fast_tlb_refill_handler(&p, &l, &r, K0, K1, |
1261 | scratch_reg); | 1265 | scratch_reg); |
1262 | vmalloc_mode = refill_scratch; | 1266 | vmalloc_mode = refill_scratch; |