[PATCH RESEND 51/62] init: rename get_boot_config_from_initrd to get_boot_config_from_initramfs
Askar Safin <[email protected]> Sun, 14 Sep 2025 06:58:14 +0300
| Newsgroups | org.kernel.vger.initramfs,dev.linux.lists.loongarch,dev.linux.lists.patches,org.infradead.lists.linux-riscv,org.infradead.lists.linux-snps-arc,org.infradead.lists.linux-um,org.kernel.vger.linux-acpi,org.kernel.vger.linux-alpha,org.kernel.vger.linux-api,org.kernel.vger.linux-arch,org.kernel.vger.linux-block,org.kernel.vger.linux-csky,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-doc,org.kernel.vger.linux-efi,org.kernel.vger.linux-ext4,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-hexagon,org.kernel.vger.linux-kernel,org.kernel.vger.linux-m68k,org.kernel.vger.linux-mips,org.kernel.vger.linux-openrisc,org.kernel.vger.linux-parisc,org.kernel.vger.linux-s390,org.kernel.vger.linux-sh,org.kernel.vger.sparclinux,org.ozlabs.lists.linuxppc-dev |
|---|---|
| Message-ID | <[email protected]> |
This is cleanup after initrd removal Signed-off-by: Askar Safin <[email protected]> --- 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