[PATCH RESEND 51/62] init: rename get_boot_config_from_initrd to get_boot_config_from_initramfs
From: Askar Safin <hidden>
Date: 2025-09-14 03:58:21
Also in:
linux-acpi, linux-alpha, linux-api, linux-arch, linux-block, linux-doc, linux-efi, linux-ext4, linux-fsdevel, linux-m68k, linux-mips, linux-patches, linux-riscv, linux-s390, linux-sh, linux-um, linuxppc-dev, lkml, loongarch, sparclinux
Subsystem:
the rest · Maintainer:
Linus Torvalds
This is cleanup after initrd removal Signed-off-by: Askar Safin <redacted> --- init/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/init/main.c b/init/main.c
index a42f1f0fce84..c535e0613df8 100644
--- a/init/main.c
+++ b/init/main.c@@ -264,7 +264,7 @@ static int __init loglevel(char *str) early_param("loglevel", loglevel); #ifdef CONFIG_BLK_DEV_INITRD -static void * __init get_boot_config_from_initrd(size_t *_size) +static void * __init get_boot_config_from_initramfs(size_t *_size) { u32 size, csum; char *data;
@@ -311,7 +311,7 @@ static void * __init get_boot_config_from_initrd(size_t *_size) return data; } #else -static void * __init get_boot_config_from_initrd(size_t *_size) +static void * __init get_boot_config_from_initramfs(size_t *_size) { return NULL; }
@@ -420,7 +420,7 @@ static void __init setup_boot_config(void) char *err; /* Cut out the bootconfig data even if we have no bootconfig option */ - data = get_boot_config_from_initrd(&size); + data = get_boot_config_from_initramfs(&size); /* If there is no bootconfig in initrd, try embedded one. */ if (!data) data = xbc_get_embedded_bootconfig(&size);
@@ -479,7 +479,7 @@ static void __init exit_boot_config(void) static void __init setup_boot_config(void) { /* Remove bootconfig data from initrd */ - get_boot_config_from_initrd(NULL); + get_boot_config_from_initramfs(NULL); } static int __init warn_bootconfig(char *str)
--
2.47.2