Skip to content

Commit 3bf0809

Browse files
jcowgillgregkh
authored andcommitted
MIPS: Avoid BUG warning in arch_check_elf
commit c46f59e90226fa5bfcc83650edebe84ae47d454b upstream. arch_check_elf contains a usage of current_cpu_data that will call smp_processor_id() with preemption enabled and therefore triggers a "BUG: using smp_processor_id() in preemptible" warning when an fpxx executable is loaded. As a follow-up to commit b244614a60ab ("MIPS: Avoid a BUG warning during prctl(PR_SET_FP_MODE, ...)"), apply the same fix to arch_check_elf by using raw_current_cpu_data instead. The rationale quoted from the previous commit: "It is assumed throughout the kernel that if any CPU has an FPU, then all CPUs would have an FPU as well, so it is safe to perform the check with preemption enabled - change the code to use raw_ variant of the check to avoid the warning." Fixes: 46490b5 ("MIPS: kernel: elf: Improve the overall ABI and FPU mode checks") Signed-off-by: James Cowgill <James.Cowgill@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15951/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1c26c38 commit 3bf0809

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/mips/kernel/elf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ int arch_check_elf(void *_ehdr, bool has_interpreter,
206206
else if ((prog_req.fr1 && prog_req.frdefault) ||
207207
(prog_req.single && !prog_req.frdefault))
208208
/* Make sure 64-bit MIPS III/IV/64R1 will not pick FR1 */
209-
state->overall_fp_mode = ((current_cpu_data.fpu_id & MIPS_FPIR_F64) &&
209+
state->overall_fp_mode = ((raw_current_cpu_data.fpu_id & MIPS_FPIR_F64) &&
210210
cpu_has_mips_r2_r6) ?
211211
FP_FR1 : FP_FR0;
212212
else if (prog_req.fr1)

0 commit comments

Comments
 (0)