]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/mm: Convert unreachable() to BUG()
authorPeter Zijlstra <peterz@infradead.org>
Mon, 16 Dec 2024 10:08:12 +0000 (11:08 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Tue, 17 Dec 2024 16:47:21 +0000 (17:47 +0100)
Commit 2190966fbc14 ("x86: Convert unreachable() to BUG()") missed
one.

And after commit 06e24745985c ("objtool: Remove
annotate_{,un}reachable()") the invalid use of unreachable()
(rightfully) triggers warnings:

  vmlinux.o: warning: objtool: page_fault_oops() falls through to next function is_prefetch()

Fixes: 2190966fbc14 ("x86: Convert unreachable() to BUG()")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20241216093215.GD12338@noisy.programming.kicks-ass.net
arch/x86/mm/fault.c

index e6c469b323ccb748de22adc7d9f0a16dd195edad..ac52255fab01f4c83479af973bbaa348cf8c57c3 100644 (file)
@@ -678,7 +678,7 @@ page_fault_oops(struct pt_regs *regs, unsigned long error_code,
                              ASM_CALL_ARG3,
                              , [arg1] "r" (regs), [arg2] "r" (address), [arg3] "r" (&info));
 
-               unreachable();
+               BUG();
        }
 #endif