diff options
| author |   Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> | 2014-11-24 15:42:46 +0000 |
|---|---|---|
| committer |   Markos Chandras <markos.chandras@imgtec.com> | 2015-02-17 15:37:30 +0000 |
| commit | 77f3ee59ee7cfe19e0ee48d9a990c7967fbfcbed (patch) | |
| tree | 0ec062a246b5d8525feaf992630df643bafc08b6 /arch/mips/mm | |
| parent | MIPS: mm: page: Add MIPS R6 support (diff) | |
| download | linux-dev-77f3ee59ee7cfe19e0ee48d9a990c7967fbfcbed.tar.xz linux-dev-77f3ee59ee7cfe19e0ee48d9a990c7967fbfcbed.zip | |
MIPS: mm: tlbex: Use cpu_has_mips_r2_exec_hazard for the EHB instruction
MIPS uses the cpu_has_mips_r2_exec_hazard macro to determine whether the
EHB instruction is available or not. This is necessary for MIPS R6
which also supports the EHB instruction.
Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/mm')
| -rw-r--r-- | arch/mips/mm/tlbex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index ff8d99ce3b9b..d75ff73a2012 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -501,7 +501,7 @@ static void build_tlb_write_entry(u32 **p, struct uasm_label **l, case tlb_indexed: tlbw = uasm_i_tlbwi; break; } - if (cpu_has_mips_r2) { + if (cpu_has_mips_r2_exec_hazard) { /* * The architecture spec says an ehb is required here, * but a number of cores do not have the hazard and @@ -1953,7 +1953,7 @@ static void build_r4000_tlb_load_handler(void) switch (current_cpu_type()) { default: - if (cpu_has_mips_r2) { + if (cpu_has_mips_r2_exec_hazard) { uasm_i_ehb(&p); case CPU_CAVIUM_OCTEON: @@ -2020,7 +2020,7 @@ static void build_r4000_tlb_load_handler(void) switch (current_cpu_type()) { default: - if (cpu_has_mips_r2) { + if (cpu_has_mips_r2_exec_hazard) { uasm_i_ehb(&p); case CPU_CAVIUM_OCTEON: |