[PATCH RESEND 33/62] init: remove init/do_mounts_initrd.c
From: Askar Safin <hidden>
Date: 2025-09-13 01:16:13
Also in:
linux-acpi, linux-alpha, linux-api, linux-arch, linux-block, linux-devicetree, 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:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
This is cleanup after initrd removal Signed-off-by: Askar Safin <redacted> --- init/Makefile | 1 - init/do_mounts_initrd.c | 36 ------------------------------------ init/initramfs.c | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 init/do_mounts_initrd.c
diff --git a/init/Makefile b/init/Makefile
index b020154b3d2a..09657c0274eb 100644
--- a/init/Makefile
+++ b/init/Makefile@@ -17,7 +17,6 @@ obj-$(CONFIG_INITRAMFS_TEST) += initramfs_test.o obj-y += init_task.o mounts-y := do_mounts.o -mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o # # UTS_VERSION
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
deleted file mode 100644
index 509f912c0fce..000000000000
--- a/init/do_mounts_initrd.c
+++ /dev/null@@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <linux/unistd.h> -#include <linux/kernel.h> -#include <linux/fs.h> -#include <linux/minix_fs.h> -#include <linux/romfs_fs.h> -#include <linux/initrd.h> -#include <linux/sched.h> -#include <linux/freezer.h> -#include <linux/kmod.h> -#include <uapi/linux/mount.h> - -#include "do_mounts.h" - -static int __init early_initrdmem(char *p) -{ - phys_addr_t start; - unsigned long size; - char *endp; - - start = memparse(p, &endp); - if (*endp == ',') { - size = memparse(endp + 1, NULL); - - phys_external_initramfs_start = start; - phys_external_initramfs_size = size; - } - return 0; -} -early_param("initrdmem", early_initrdmem); - -static int __init early_initrd(char *p) -{ - return early_initrdmem(p); -} -early_param("initrd", early_initrd);
diff --git a/init/initramfs.c b/init/initramfs.c
index 90096177a867..8ed352721a79 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c@@ -606,6 +606,29 @@ int initramfs_below_start_ok; phys_addr_t phys_external_initramfs_start __initdata; unsigned long phys_external_initramfs_size __initdata; +static int __init early_initrdmem(char *p) +{ + phys_addr_t start; + unsigned long size; + char *endp; + + start = memparse(p, &endp); + if (*endp == ',') { + size = memparse(endp + 1, NULL); + + phys_external_initramfs_start = start; + phys_external_initramfs_size = size; + } + return 0; +} +early_param("initrdmem", early_initrdmem); + +static int __init early_initrd(char *p) +{ + return early_initrdmem(p); +} +early_param("initrd", early_initrd); + static BIN_ATTR(initrd, 0440, sysfs_bin_attr_simple_read, NULL, 0); void __init reserve_initrd_mem(void)
--
2.47.2