diff options
| author | Paul Burton <paul.burton@mips.com> | 2019-10-01 23:04:32 +0000 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2019-10-07 09:38:54 -0700 |
| commit | 5045d06b37361c6fbe05357c765f6b9a6fcaea87 (patch) | |
| tree | 7dc54e7b5acc53f7e71ffabb22fac7e0b590cfd6 /arch/mips/kernel | |
| parent | 071d2f0b5419d3cf80cc8ba73ec8fe2cedc4cc0c (diff) | |
MIPS: r4k-bugs64: Drop CONFIG_CPU_MIPSR6 checks
The r4k-bugs64 code will no longer be built for MIPSr6 kernel
configurations, so there's no need to perform checks for MIPSr6 within
the code. Drop those redundant checks.
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/r4k-bugs64.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/mips/kernel/r4k-bugs64.c b/arch/mips/kernel/r4k-bugs64.c index 6a7afe7ef4d3..1ff19f1ea5ca 100644 --- a/arch/mips/kernel/r4k-bugs64.c +++ b/arch/mips/kernel/r4k-bugs64.c @@ -242,7 +242,7 @@ static __init void check_daddi(void) panic(bug64hit, !DADDI_WAR ? daddiwar : nowar); } -int daddiu_bug = IS_ENABLED(CONFIG_CPU_MIPSR6) ? 0 : -1; +int daddiu_bug = -1; static __init void check_daddiu(void) { @@ -312,14 +312,11 @@ static __init void check_daddiu(void) void __init check_bugs64_early(void) { - if (!IS_ENABLED(CONFIG_CPU_MIPSR6)) { - check_mult_sh(); - check_daddiu(); - } + check_mult_sh(); + check_daddiu(); } void __init check_bugs64(void) { - if (!IS_ENABLED(CONFIG_CPU_MIPSR6)) - check_daddi(); + check_daddi(); } |