]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/boot/e820: Remove pointless early_panic() indirection
authorIngo Molnar <mingo@kernel.org>
Thu, 15 May 2025 12:05:27 +0000 (14:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 14 Dec 2025 08:19:38 +0000 (09:19 +0100)
early_panic() is a pointless wrapper around panic():

static void __init early_panic(char *msg)
{
early_printk(msg);
panic(msg);
}

panic() will already do a printk() of 'msg', and an early_printk() if
earlyprintk is enabled. There's no need to print it separately.

Remove the function.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Shevchenko <andy@kernel.org>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Paul Menzel <pmenzel@molgen.mpg.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Link: https://patch.msgid.link/20250515120549.2820541-12-mingo@kernel.org
arch/x86/kernel/e820.c

index 037864890183d199b1971f8c665e4e43500a09ad..6bc06860c6b06d413c12af804d18faa81a0591de 100644 (file)
@@ -893,12 +893,6 @@ unsigned long __init e820__end_of_low_ram_pfn(void)
        return e820__end_ram_pfn(1UL << (32 - PAGE_SHIFT));
 }
 
-static void __init early_panic(char *msg)
-{
-       early_printk(msg);
-       panic(msg);
-}
-
 static int userdef __initdata;
 
 /* The "mem=nopentium" boot option disables 4MB page tables on 32-bit kernels: */
@@ -1018,7 +1012,7 @@ void __init e820__finish_early_params(void)
 {
        if (userdef) {
                if (e820__update_table(e820_table) < 0)
-                       early_panic("Invalid user supplied memory map");
+                       panic("Invalid user supplied memory map");
 
                pr_info("user-defined physical RAM map:\n");
                e820__print_table("user");