mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
MIPS: Sanitise Cavium switch cases in TLB handler synthesizers
[ Upstream commit6ddcba9d48
] It makes no sense to fall through to `break'. Therefore reorder the switch statements so as to have the Cavium cases first, followed by the default case, which improves readability and pacifies code analysis tools. No change in semantics, assembly produced is exactly the same. Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk> Fixes:bc431d2153
("MIPS: Fix fall-through warnings for Clang") Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
d6eb8b15b1
commit
7379ad2594
1 changed files with 10 additions and 13 deletions
|
@ -2160,16 +2160,14 @@ static void build_r4000_tlb_load_handler(void)
|
|||
uasm_i_tlbr(&p);
|
||||
|
||||
switch (current_cpu_type()) {
|
||||
default:
|
||||
if (cpu_has_mips_r2_exec_hazard) {
|
||||
uasm_i_ehb(&p);
|
||||
fallthrough;
|
||||
|
||||
case CPU_CAVIUM_OCTEON:
|
||||
case CPU_CAVIUM_OCTEON_PLUS:
|
||||
case CPU_CAVIUM_OCTEON2:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (cpu_has_mips_r2_exec_hazard)
|
||||
uasm_i_ehb(&p);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Examine entrylo 0 or 1 based on ptr. */
|
||||
|
@ -2236,15 +2234,14 @@ static void build_r4000_tlb_load_handler(void)
|
|||
uasm_i_tlbr(&p);
|
||||
|
||||
switch (current_cpu_type()) {
|
||||
default:
|
||||
if (cpu_has_mips_r2_exec_hazard) {
|
||||
uasm_i_ehb(&p);
|
||||
|
||||
case CPU_CAVIUM_OCTEON:
|
||||
case CPU_CAVIUM_OCTEON_PLUS:
|
||||
case CPU_CAVIUM_OCTEON2:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (cpu_has_mips_r2_exec_hazard)
|
||||
uasm_i_ehb(&p);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Examine entrylo 0 or 1 based on ptr. */
|
||||
|
|
Loading…
Reference in a new issue