* [PATCH RESEND 32/62] init: move initramfs_below_start_ok to init/initramfs.c
From: Askar Safin @ 2025-09-13 0:38 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/do_mounts_initrd.c | 2 --
init/initramfs.c | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index d8b809ced11b..509f912c0fce 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -12,8 +12,6 @@
#include "do_mounts.h"
-int initramfs_below_start_ok;
-
static int __init early_initrdmem(char *p)
{
phys_addr_t start;
diff --git a/init/initramfs.c b/init/initramfs.c
index a9c5d211665d..90096177a867 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -601,6 +601,7 @@ __setup("initramfs_async=", initramfs_async_setup);
#include <linux/kexec.h>
unsigned long virt_external_initramfs_start, virt_external_initramfs_end;
+int initramfs_below_start_ok;
phys_addr_t phys_external_initramfs_start __initdata;
unsigned long phys_external_initramfs_size __initdata;
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 33/62] init: remove init/do_mounts_initrd.c
From: Askar Safin @ 2025-09-13 0:38 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
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
^ permalink raw reply related
* [PATCH RESEND 34/62] init: inline create_dev into the only caller
From: Askar Safin @ 2025-09-13 0:38 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/do_mounts.c | 5 ++++-
init/do_mounts.h | 6 ------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 5c407ca54063..60ba8a633d32 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -366,7 +366,10 @@ static int __init mount_nodev_root(char *root_device_name)
#ifdef CONFIG_BLOCK
static void __init mount_block_root(char *root_device_name)
{
- int err = create_dev("/dev/root", ROOT_DEV);
+ int err;
+
+ init_unlink("/dev/root");
+ err = init_mknod("/dev/root", S_IFBLK | 0600, new_encode_dev(ROOT_DEV));
if (err < 0)
pr_emerg("Failed to create /dev/root: %d\n", err);
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 6c7a535e71ce..f3df9d697304 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -16,12 +16,6 @@ void mount_root_generic(char *name, char *pretty_name, int flags);
void mount_root(char *root_device_name);
extern int root_mountflags;
-static inline __init int create_dev(char *name, dev_t dev)
-{
- init_unlink(name);
- return init_mknod(name, S_IFBLK | 0600, new_encode_dev(dev));
-}
-
/* Ensure that async file closing finished to prevent spurious errors. */
static inline void init_flush_fput(void)
{
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 35/62] init: make mount_root_generic static
From: Askar Safin @ 2025-09-13 0:38 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/do_mounts.c | 2 +-
init/do_mounts.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 60ba8a633d32..c722351c991f 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -174,7 +174,7 @@ static int __init do_mount_root(const char *name, const char *fs,
return ret;
}
-void __init mount_root_generic(char *name, char *pretty_name, int flags)
+static void __init mount_root_generic(char *name, char *pretty_name, int flags)
{
struct page *page = alloc_page(GFP_KERNEL);
char *fs_names = page_address(page);
diff --git a/init/do_mounts.h b/init/do_mounts.h
index f3df9d697304..f291c30f7407 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -12,7 +12,6 @@
#include <linux/task_work.h>
#include <linux/file.h>
-void mount_root_generic(char *name, char *pretty_name, int flags);
void mount_root(char *root_device_name);
extern int root_mountflags;
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 36/62] init: make mount_root static
From: Askar Safin @ 2025-09-13 0:38 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/do_mounts.c | 2 +-
init/do_mounts.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index c722351c991f..7ec5ee5a5c19 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -381,7 +381,7 @@ static inline void mount_block_root(char *root_device_name)
}
#endif /* CONFIG_BLOCK */
-void __init mount_root(char *root_device_name)
+static void __init mount_root(char *root_device_name)
{
switch (ROOT_DEV) {
case Root_NFS:
diff --git a/init/do_mounts.h b/init/do_mounts.h
index f291c30f7407..90422fb07c02 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -12,7 +12,6 @@
#include <linux/task_work.h>
#include <linux/file.h>
-void mount_root(char *root_device_name);
extern int root_mountflags;
/* Ensure that async file closing finished to prevent spurious errors. */
--
2.47.2
^ permalink raw reply related
* Re: [PATCH RESEND 28/62] init: alpha, arc, arm, arm64, csky, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, s390, sh, sparc, um, x86, xtensa: rename initrd_{start,end} to virt_external_initramfs_{start,end}
From: Borislav Petkov @ 2025-09-13 5:48 UTC (permalink / raw)
To: Askar Safin
Cc: linux-fsdevel, linux-kernel, Linus Torvalds, Greg Kroah-Hartman,
Christian Brauner, Al Viro, Jan Kara, Christoph Hellwig,
Jens Axboe, Andy Shevchenko, Aleksa Sarai, Thomas Weißschuh,
Julian Stecklina, Gao Xiang, Art Nikpal, Andrew Morton,
Eric Curtin, Alexander Graf, Rob Landley, Lennart Poettering,
linux-arch, linux-alpha, linux-snps-arc, linux-arm-kernel,
linux-csky, linux-hexagon, loongarch, linux-m68k, linux-mips,
linux-openrisc, linux-parisc, linuxppc-dev, linux-riscv,
linux-s390, linux-sh, sparclinux, linux-um, x86, Ingo Molnar,
linux-block, initramfs, linux-api, linux-doc, linux-efi,
linux-ext4, Theodore Y . Ts'o, linux-acpi, Michal Simek,
devicetree, Luis Chamberlain, Kees Cook, Thorsten Blum,
Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-29-safinaskar@gmail.com>
On Sat, Sep 13, 2025 at 12:38:07AM +0000, Askar Safin wrote:
> Rename initrd_start to virt_external_initramfs_start and
> initrd_end to virt_external_initramfs_end.
"virt" as in "virtualization"?
That's not confusing at all... :-\
And "external" means what?
> They refer to initramfs, not to initrd
Why not simply initramfs_{start,end} if they belong to it?
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply
* Re: [PATCH RESEND 28/62] init: alpha, arc, arm, arm64, csky, m68k, microblaze, mips, nios2, openrisc, parisc, powerpc, s390, sh, sparc, um, x86, xtensa: rename initrd_{start,end} to virt_external_initramfs_{start,end}
From: Borislav Petkov @ 2025-09-13 5:59 UTC (permalink / raw)
To: Askar Safin
Cc: linux-fsdevel, linux-kernel, Linus Torvalds, Greg Kroah-Hartman,
Christian Brauner, Al Viro, Jan Kara, Christoph Hellwig,
Jens Axboe, Andy Shevchenko, Aleksa Sarai, Thomas Weißschuh,
Julian Stecklina, Gao Xiang, Art Nikpal, Andrew Morton,
Alexander Graf, Rob Landley, Lennart Poettering, linux-arch,
linux-alpha, linux-snps-arc, linux-arm-kernel, linux-csky,
linux-hexagon, loongarch, linux-m68k, linux-mips, linux-openrisc,
linux-parisc, linuxppc-dev, linux-riscv, linux-s390, linux-sh,
sparclinux, linux-um, x86, Ingo Molnar, linux-block, initramfs,
linux-api, linux-doc, linux-efi, linux-ext4,
Theodore Y . Ts'o, linux-acpi, Michal Simek, devicetree,
Luis Chamberlain, Kees Cook, Thorsten Blum, Heiko Carstens,
patches
In-Reply-To: <20250913054837.GAaMUFtd4YlaPqL2Ov@fat_crate.local>
On Sat, Sep 13, 2025 at 07:48:37AM +0200, Borislav Petkov wrote:
> On Sat, Sep 13, 2025 at 12:38:07AM +0000, Askar Safin wrote:
> > Rename initrd_start to virt_external_initramfs_start and
> > initrd_end to virt_external_initramfs_end.
>
> "virt" as in "virtualization"?
Ooh, now I see it - you have virtual and physical initramfs address things. We
usually call those "va" and "pa". So
initramfs_{va,pa}_{start,end}
perhaps...
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply
* Re: [PATCH RESEND 00/62] initrd: remove classic initrd support
From: Julian Stecklina @ 2025-09-13 8:58 UTC (permalink / raw)
To: safinaskar@gmail.com, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: tytso@mit.edu, linux-csky@vger.kernel.org,
linux-arch@vger.kernel.org, rob@landley.net,
linux-snps-arc@lists.infradead.org, mzxreary@0pointer.de,
viro@zeniv.linux.org.uk, jack@suse.cz, linux-mips@vger.kernel.org,
axboe@kernel.dk, linux-riscv@lists.infradead.org, hch@lst.de,
thomas.weissschuh@linutronix.de, linux-block@vger.kernel.org,
linux-ext4@vger.kernel.org, linux-openrisc@vger.kernel.org,
linux-acpi@vger.kernel.org, linux-s390@vger.kernel.org,
x86@kernel.org, kees@kernel.org, linux-parisc@vger.kernel.org,
linux-api@vger.kernel.org, hsiangkao@linux.alibaba.com,
mcgrof@kernel.org, linux-efi@vger.kernel.org, cyphar@cyphar.com,
linuxppc-dev@lists.ozlabs.org, hca@linux.ibm.com,
linux-m68k@lists.linux-m68k.org, monstr@monstr.eu,
andy.shevchenko@gmail.com, graf@amazon.com, brauner@kernel.org,
gregkh@linuxfoundation.org, email2tema@gmail.com,
linux-sh@vger.kernel.org, sparclinux@vger.kernel.org,
ecurtin@redhat.com, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-hexagon@vger.kernel.org, linux-alpha@vger.kernel.org,
linux-um@lists.infradead.org, mingo@redhat.com,
loongarch@lists.linux.dev, initramfs@vger.kernel.org,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
linux-doc@vger.kernel.org, patches@lists.linux.dev,
thorsten.blum@linux.dev
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
On Sat, 2025-09-13 at 00:37 +0000, Askar Safin wrote:
> Intro
> ====
> This patchset removes classic initrd (initial RAM disk) support,
> which was deprecated in 2020.
> Initramfs still stays, and RAM disk itself (brd) still stays, too.
> init/do_mounts* and init/*initramfs* are listed in VFS entry in
> MAINTAINERS, so I think this patchset should go through VFS tree.
> This patchset touchs every subdirectory in arch/, so I tested it
> on 8 (!!!) archs in Qemu (see details below).
> Warning: this patchset renames CONFIG_BLK_DEV_INITRD (!!!) to CONFIG_INITRAMFS
> and CONFIG_RD_* to CONFIG_INITRAMFS_DECOMPRESS_* (for example,
> CONFIG_RD_GZIP to CONFIG_INITRAMFS_DECOMPRESS_GZIP).
> If you still use initrd, see below for workaround.
>
As the person who kicked this off by trying to get erofs support for initrds:
You have all my support for nuking so much legacy code! I'm all for removing
historical baggage even if it comes with slight inconveniences for fringe
usecase users (me!).
If this series goes through, I'll drink a beer to you!
Acked-by: Julian Stecklina <julian.stecklina@cyberus-technology.de>
>
> Also I renamed CONFIG_BLK_DEV_INITRD (which became total misnomer)
> to CONFIG_INITRAMFS. And CONFIG_RD_* to CONFIG_INITRAMFS_DECOMPRESS_*.
> This will break all configs out there (update your configs!).
This is beautiful. The original names were pretty misleading!
> Workaround
> ====
> If "retain_initrd" is passed to kernel, then initramfs/initrd,
> passed by bootloader, is retained and becomes available after boot
> as read-only magic file /sys/firmware/initrd [3].
This is pretty neat, because now you can use _all filesystems_ as initrds. :-D
This solves my original problem, albeit with a tiny shim initramfs. Nice!
Julian
^ permalink raw reply
* [PATCH RESEND 37/62] init: remove root_mountflags from init/do_mounts.h
From: Askar Safin @ 2025-09-14 3:43 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
It is already declared in include/linux/kernel.h
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/do_mounts.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 90422fb07c02..e225d594dd06 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -12,8 +12,6 @@
#include <linux/task_work.h>
#include <linux/file.h>
-extern int root_mountflags;
-
/* Ensure that async file closing finished to prevent spurious errors. */
static inline void init_flush_fput(void)
{
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 38/62] init: remove most headers from init/do_mounts.h
From: Askar Safin @ 2025-09-14 3:50 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/do_mounts.c | 2 ++
init/do_mounts.h | 10 ----------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 7ec5ee5a5c19..5b55d0035e03 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -5,12 +5,14 @@
#include <linux/fd.h>
#include <linux/tty.h>
#include <linux/suspend.h>
+#include <linux/blkdev.h>
#include <linux/root_dev.h>
#include <linux/security.h>
#include <linux/delay.h>
#include <linux/mount.h>
#include <linux/device.h>
#include <linux/init.h>
+#include <linux/init_syscalls.h>
#include <linux/fs.h>
#include <linux/initrd.h>
#include <linux/async.h>
diff --git a/init/do_mounts.h b/init/do_mounts.h
index e225d594dd06..53e60add795a 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -1,14 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#include <linux/kernel.h>
-#include <linux/blkdev.h>
-#include <linux/init.h>
-#include <linux/syscalls.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/mount.h>
-#include <linux/major.h>
-#include <linux/root_dev.h>
-#include <linux/init_syscalls.h>
#include <linux/task_work.h>
#include <linux/file.h>
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 39/62] init: make console_on_rootfs static
From: Askar Safin @ 2025-09-14 3:51 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
include/linux/initrd.h | 2 --
init/main.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/linux/initrd.h b/include/linux/initrd.h
index 364b603215ac..55239701c4e0 100644
--- a/include/linux/initrd.h
+++ b/include/linux/initrd.h
@@ -23,6 +23,4 @@ extern unsigned long phys_external_initramfs_size;
extern char __builtin_initramfs_start[];
extern unsigned long __builtin_initramfs_size;
-void console_on_rootfs(void);
-
#endif /* __LINUX_INITRD_H */
diff --git a/init/main.c b/init/main.c
index 58a7199c81f7..f119460bf8e1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1533,7 +1533,7 @@ static int __ref kernel_init(void *unused)
}
/* Open /dev/console, for stdin/stdout/stderr, this should never fail */
-void __init console_on_rootfs(void)
+static void __init console_on_rootfs(void)
{
struct file *file = filp_open("/dev/console", O_RDWR, 0);
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 40/62] init: rename free_initrd_mem to free_initramfs_mem
From: Askar Safin @ 2025-09-14 3:51 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
arch/arm/mm/init.c | 2 +-
arch/x86/mm/init.c | 2 +-
include/linux/initrd.h | 2 +-
init/initramfs.c | 10 +++++-----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 4faeec51c522..290e9f9874c9 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -437,7 +437,7 @@ void free_initmem(void)
}
#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
+void free_initramfs_mem(unsigned long start, unsigned long end)
{
if (start == virt_external_initramfs_start)
start = round_down(start, PAGE_SIZE);
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index bb57e93b4caf..c7ca996fb430 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -981,7 +981,7 @@ void __ref free_initmem(void)
}
#ifdef CONFIG_BLK_DEV_INITRD
-void __init free_initrd_mem(unsigned long start, unsigned long end)
+void __init free_initramfs_mem(unsigned long start, unsigned long end)
{
/*
* end could be not aligned, and We can not align that,
diff --git a/include/linux/initrd.h b/include/linux/initrd.h
index 55239701c4e0..b2a0128c3438 100644
--- a/include/linux/initrd.h
+++ b/include/linux/initrd.h
@@ -7,7 +7,7 @@
extern int initramfs_below_start_ok;
extern unsigned long virt_external_initramfs_start, virt_external_initramfs_end;
-extern void free_initrd_mem(unsigned long, unsigned long);
+extern void free_initramfs_mem(unsigned long, unsigned long);
#ifdef CONFIG_BLK_DEV_INITRD
extern void __init reserve_initrd_mem(void);
diff --git a/init/initramfs.c b/init/initramfs.c
index 8ed352721a79..7a050e54ff1a 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -642,7 +642,7 @@ void __init reserve_initrd_mem(void)
if (!phys_external_initramfs_size)
return;
/*
- * Round the memory region to page boundaries as per free_initrd_mem()
+ * Round the memory region to page boundaries as per free_initramfs_mem()
* This allows us to detect whether the pages overlapping the initrd
* are in use, but more importantly, reserves the entire set of pages
* as we don't want these pages allocated for other purposes.
@@ -676,7 +676,7 @@ void __init reserve_initrd_mem(void)
virt_external_initramfs_end = 0;
}
-void __weak __init free_initrd_mem(unsigned long start, unsigned long end)
+void __weak __init free_initramfs_mem(unsigned long start, unsigned long end)
{
#ifdef CONFIG_ARCH_KEEP_MEMBLOCK
unsigned long aligned_start = ALIGN_DOWN(start, PAGE_SIZE);
@@ -707,9 +707,9 @@ static bool __init kexec_free_initrd(void)
*/
memset((void *)virt_external_initramfs_start, 0, virt_external_initramfs_end - virt_external_initramfs_start);
if (virt_external_initramfs_start < crashk_start)
- free_initrd_mem(virt_external_initramfs_start, crashk_start);
+ free_initramfs_mem(virt_external_initramfs_start, crashk_start);
if (virt_external_initramfs_end > crashk_end)
- free_initrd_mem(crashk_end, virt_external_initramfs_end);
+ free_initramfs_mem(crashk_end, virt_external_initramfs_end);
return true;
}
#else
@@ -744,7 +744,7 @@ static void __init do_populate_rootfs(void *unused, async_cookie_t cookie)
* free only memory that is not part of crashkernel region.
*/
if (!do_retain_initrd && virt_external_initramfs_start && !kexec_free_initrd()) {
- free_initrd_mem(virt_external_initramfs_start, virt_external_initramfs_end);
+ free_initramfs_mem(virt_external_initramfs_start, virt_external_initramfs_end);
} else if (do_retain_initrd && virt_external_initramfs_start) {
bin_attr_initrd.size = virt_external_initramfs_end - virt_external_initramfs_start;
bin_attr_initrd.private = (void *)virt_external_initramfs_start;
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 41/62] init: rename reserve_initrd_mem to reserve_initramfs_mem
From: Askar Safin @ 2025-09-14 3:52 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
arch/arm/mm/init.c | 2 +-
arch/loongarch/kernel/setup.c | 2 +-
arch/riscv/mm/init.c | 2 +-
include/linux/initrd.h | 4 ++--
init/initramfs.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 290e9f9874c9..a564cbc36d18 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -186,7 +186,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc)
/* Register the kernel text, kernel data and initrd with memblock. */
memblock_reserve(__pa(KERNEL_START), KERNEL_END - KERNEL_START);
- reserve_initrd_mem();
+ reserve_initramfs_mem();
arm_mm_memblock_reserve();
diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
index 075b79b2c1d3..226262f35dc1 100644
--- a/arch/loongarch/kernel/setup.c
+++ b/arch/loongarch/kernel/setup.c
@@ -602,7 +602,7 @@ void __init setup_arch(char **cmdline_p)
pagetable_init();
bootcmdline_init(cmdline_p);
parse_early_param();
- reserve_initrd_mem();
+ reserve_initramfs_mem();
platform_init();
arch_mem_init(cmdline_p);
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 15683ae13fa5..b1c4876dadae 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -295,7 +295,7 @@ static void __init setup_bootmem(void)
dma32_phys_limit = min(4UL * SZ_1G, (unsigned long)PFN_PHYS(max_low_pfn));
- reserve_initrd_mem();
+ reserve_initramfs_mem();
/*
* No allocation should be done before reserving the memory as defined
diff --git a/include/linux/initrd.h b/include/linux/initrd.h
index b2a0128c3438..51c473b6a973 100644
--- a/include/linux/initrd.h
+++ b/include/linux/initrd.h
@@ -10,10 +10,10 @@ extern unsigned long virt_external_initramfs_start, virt_external_initramfs_end;
extern void free_initramfs_mem(unsigned long, unsigned long);
#ifdef CONFIG_BLK_DEV_INITRD
-extern void __init reserve_initrd_mem(void);
+extern void __init reserve_initramfs_mem(void);
extern void wait_for_initramfs(void);
#else
-static inline void __init reserve_initrd_mem(void) {}
+static inline void __init reserve_initramfs_mem(void) {}
static inline void wait_for_initramfs(void) {}
#endif
diff --git a/init/initramfs.c b/init/initramfs.c
index 7a050e54ff1a..a6c11260e62b 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -631,7 +631,7 @@ early_param("initrd", early_initrd);
static BIN_ATTR(initrd, 0440, sysfs_bin_attr_simple_read, NULL, 0);
-void __init reserve_initrd_mem(void)
+void __init reserve_initramfs_mem(void)
{
phys_addr_t start;
unsigned long size;
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 42/62] init: rename <linux/initrd.h> to <linux/initramfs.h>
From: Askar Safin @ 2025-09-14 3:52 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
arch/alpha/kernel/core_irongate.c | 2 +-
arch/alpha/kernel/setup.c | 2 +-
arch/arc/mm/init.c | 2 +-
arch/arm/kernel/atags_parse.c | 2 +-
arch/arm/kernel/setup.c | 2 +-
arch/arm/mm/init.c | 2 +-
arch/arm64/kernel/setup.c | 2 +-
arch/arm64/mm/init.c | 2 +-
arch/csky/kernel/setup.c | 2 +-
arch/csky/mm/init.c | 2 +-
arch/loongarch/kernel/mem.c | 2 +-
arch/loongarch/kernel/setup.c | 2 +-
arch/m68k/kernel/setup_mm.c | 2 +-
arch/m68k/kernel/setup_no.c | 2 +-
arch/m68k/kernel/uboot.c | 2 +-
arch/microblaze/kernel/cpu/mb.c | 2 +-
arch/microblaze/kernel/setup.c | 2 +-
arch/microblaze/mm/init.c | 2 +-
arch/mips/ath79/prom.c | 2 +-
arch/mips/kernel/setup.c | 2 +-
arch/mips/mm/init.c | 2 +-
arch/mips/sibyte/swarm/setup.c | 2 +-
arch/nios2/kernel/setup.c | 2 +-
arch/openrisc/kernel/setup.c | 2 +-
arch/parisc/kernel/pdt.c | 2 +-
arch/parisc/kernel/setup.c | 2 +-
arch/parisc/mm/init.c | 2 +-
arch/powerpc/kernel/prom.c | 2 +-
arch/powerpc/kernel/prom_init.c | 2 +-
arch/powerpc/kernel/setup-common.c | 2 +-
arch/powerpc/kernel/setup_32.c | 2 +-
arch/powerpc/kernel/setup_64.c | 2 +-
arch/powerpc/mm/init_32.c | 2 +-
arch/powerpc/platforms/52xx/lite5200.c | 2 +-
arch/powerpc/platforms/83xx/km83xx.c | 2 +-
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +-
arch/powerpc/platforms/chrp/setup.c | 2 +-
arch/powerpc/platforms/embedded6xx/linkstation.c | 2 +-
arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +-
arch/powerpc/platforms/powermac/setup.c | 2 +-
arch/riscv/mm/init.c | 2 +-
arch/s390/kernel/setup.c | 2 +-
arch/s390/mm/init.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sparc/kernel/setup_32.c | 2 +-
arch/sparc/kernel/setup_64.c | 2 +-
arch/sparc/mm/init_32.c | 2 +-
arch/sparc/mm/init_64.c | 2 +-
arch/um/kernel/initrd.c | 2 +-
arch/x86/kernel/cpu/microcode/amd.c | 2 +-
arch/x86/kernel/cpu/microcode/intel.c | 2 +-
arch/x86/kernel/cpu/microcode/internal.h | 2 +-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kernel/setup.c | 2 +-
arch/x86/mm/init.c | 2 +-
arch/x86/mm/init_32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
drivers/acpi/tables.c | 2 +-
drivers/base/firmware_loader/main.c | 2 +-
drivers/block/brd.c | 2 +-
drivers/firmware/efi/efi.c | 2 +-
drivers/of/fdt.c | 2 +-
include/linux/{initrd.h => initramfs.h} | 6 +++---
init/do_mounts.c | 2 +-
init/initramfs.c | 2 +-
init/main.c | 2 +-
kernel/sysctl.c | 2 +-
kernel/umh.c | 2 +-
68 files changed, 70 insertions(+), 70 deletions(-)
rename include/linux/{initrd.h => initramfs.h} (89%)
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c
index 5519bb8fc6f2..83b799848b39 100644
--- a/arch/alpha/kernel/core_irongate.c
+++ b/arch/alpha/kernel/core_irongate.c
@@ -19,7 +19,7 @@
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/memblock.h>
#include <asm/ptrace.h>
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index a344e71b2d2a..809651206781 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -34,7 +34,7 @@
#include <linux/pci.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/eisa.h>
#include <linux/pfn.h>
#ifdef CONFIG_MAGIC_SYSRQ
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index 1e098d7fc6af..00aaf1ed389f 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -7,7 +7,7 @@
#include <linux/mm.h>
#include <linux/memblock.h>
#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#endif
#include <linux/of_fdt.h>
#include <linux/swap.h>
diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c
index 615d9e83c9b5..2b49e0ddfa42 100644
--- a/arch/arm/kernel/atags_parse.c
+++ b/arch/arm/kernel/atags_parse.c
@@ -15,7 +15,7 @@
*/
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/root_dev.h>
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 0bfd66c7ada0..876039b24290 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -11,7 +11,7 @@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/utsname.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/console.h>
#include <linux/seq_file.h>
#include <linux/screen_info.h>
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index a564cbc36d18..ae5921db626e 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -13,7 +13,7 @@
#include <linux/sched/task.h>
#include <linux/export.h>
#include <linux/nodemask.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of_fdt.h>
#include <linux/highmem.h>
#include <linux/gfp.h>
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 77c7926a4df6..bddbb473ad88 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -12,7 +12,7 @@
#include <linux/stddef.h>
#include <linux/ioport.h>
#include <linux/delay.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/console.h>
#include <linux/cache.h>
#include <linux/screen_info.h>
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3414e48c8c82..e50533faaece 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -14,7 +14,7 @@
#include <linux/cache.h>
#include <linux/mman.h>
#include <linux/nodemask.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/gfp.h>
#include <linux/math.h>
#include <linux/memblock.h>
diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c
index 403a977b8c1f..9feca38d4c47 100644
--- a/arch/csky/kernel/setup.c
+++ b/arch/csky/kernel/setup.c
@@ -3,7 +3,7 @@
#include <linux/console.h>
#include <linux/memblock.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/start_kernel.h>
diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c
index 573da66b2543..f2d1004fc6ae 100644
--- a/arch/csky/mm/init.c
+++ b/arch/csky/mm/init.c
@@ -19,7 +19,7 @@
#include <linux/swap.h>
#include <linux/proc_fs.h>
#include <linux/pfn.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/setup.h>
#include <asm/cachectl.h>
diff --git a/arch/loongarch/kernel/mem.c b/arch/loongarch/kernel/mem.c
index aed901c57fb4..5ec4d18c9000 100644
--- a/arch/loongarch/kernel/mem.c
+++ b/arch/loongarch/kernel/mem.c
@@ -3,7 +3,7 @@
* Copyright (C) 2020-2022 Loongson Technology Corporation Limited
*/
#include <linux/efi.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/memblock.h>
#include <asm/bootinfo.h>
diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
index 226262f35dc1..5d0124cbe94b 100644
--- a/arch/loongarch/kernel/setup.c
+++ b/arch/loongarch/kernel/setup.c
@@ -17,7 +17,7 @@
#include <linux/efi.h>
#include <linux/export.h>
#include <linux/memblock.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/ioport.h>
#include <linux/kexec.h>
#include <linux/crash_dump.h>
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 80f0544c1041..b9c9b2e3a150 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -25,7 +25,7 @@
#include <linux/seq_file.h>
#include <linux/module.h>
#include <linux/nvram.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/random.h>
#include <asm/bootinfo.h>
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 4d98e0063725..6d3d5a299383 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -29,7 +29,7 @@
#include <linux/memblock.h>
#include <linux/seq_file.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/root_dev.h>
#include <linux/rtc.h>
diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c
index 5fc831a0794a..416e3f8f879d 100644
--- a/arch/m68k/kernel/uboot.c
+++ b/arch/m68k/kernel/uboot.c
@@ -18,7 +18,7 @@
#include <linux/memblock.h>
#include <linux/seq_file.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/root_dev.h>
#include <linux/rtc.h>
diff --git a/arch/microblaze/kernel/cpu/mb.c b/arch/microblaze/kernel/cpu/mb.c
index 37cb2898216b..a5d2c564d4e5 100644
--- a/arch/microblaze/kernel/cpu/mb.c
+++ b/arch/microblaze/kernel/cpu/mb.c
@@ -13,7 +13,7 @@
#include <linux/string.h>
#include <linux/seq_file.h>
#include <linux/cpu.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/bug.h>
#include <asm/cpuinfo.h>
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index f417333eccae..7f537307b71c 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -14,7 +14,7 @@
#include <linux/string.h>
#include <linux/seq_file.h>
#include <linux/cpu.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/console.h>
#include <linux/debugfs.h>
#include <linux/of_fdt.h>
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index fabeca49c2c6..f54d71160712 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h> /* mem_init */
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of_fdt.h>
#include <linux/pagemap.h>
#include <linux/pfn.h>
diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c
index 506dcada711b..fcb45fe198a0 100644
--- a/arch/mips/ath79/prom.c
+++ b/arch/mips/ath79/prom.c
@@ -11,7 +11,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/string.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/bootinfo.h>
#include <asm/addrspace.h>
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index aed454ebd751..47dc7eb99ef7 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -16,7 +16,7 @@
#include <linux/ioport.h>
#include <linux/export.h>
#include <linux/memblock.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/root_dev.h>
#include <linux/highmem.h>
#include <linux/console.h>
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index a673d3d68254..5b109c737547 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -30,7 +30,7 @@
#include <linux/hardirq.h>
#include <linux/gfp.h>
#include <linux/kcore.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/execmem.h>
#include <asm/bootinfo.h>
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index 38c90b5e8754..ff8b2d8ad7ab 100644
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -15,7 +15,7 @@
#include <linux/kernel.h>
#include <linux/console.h>
#include <linux/screen_info.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/irq.h>
#include <asm/io.h>
diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c
index 3cc44fa4931c..d3d60c42df46 100644
--- a/arch/nios2/kernel/setup.c
+++ b/arch/nios2/kernel/setup.c
@@ -17,7 +17,7 @@
#include <linux/sched/task.h>
#include <linux/console.h>
#include <linux/memblock.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of_fdt.h>
#include <asm/mmu_context.h>
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 337a0381c452..27ae87c09b0e 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -29,7 +29,7 @@
#include <linux/memblock.h>
#include <linux/seq_file.h>
#include <linux/serial.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of_fdt.h>
#include <linux/of.h>
#include <linux/device.h>
diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c
index 3715a3b088a7..49982a48c92c 100644
--- a/arch/parisc/kernel/pdt.c
+++ b/arch/parisc/kernel/pdt.c
@@ -17,7 +17,7 @@
#include <linux/seq_file.h>
#include <linux/kthread.h>
#include <linux/proc_fs.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/pgtable.h>
#include <linux/mm.h>
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 41f45fa177d0..1e403c26070d 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -13,7 +13,7 @@
*/
#include <linux/kernel.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/seq_file.h>
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index af7a33c8bd31..5843f4a46e93 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -18,7 +18,7 @@
#include <linux/gfp.h>
#include <linux/delay.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/swap.h>
#include <linux/unistd.h>
#include <linux/nodemask.h> /* for node_online_map */
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index b7858b0bd697..a2a1896f9e46 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -19,7 +19,7 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/delay.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/bitops.h>
#include <linux/export.h>
#include <linux/kexec.h>
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 827c958677f8..a0ac845eb504 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -24,7 +24,7 @@
#include <linux/pci.h>
#include <linux/proc_fs.h>
#include <linux/delay.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/bitops.h>
#include <linux/pgtable.h>
#include <linux/printk.h>
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index eff369cba0e5..53a416bc41ce 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -16,7 +16,7 @@
#include <linux/kernel.h>
#include <linux/reboot.h>
#include <linux/delay.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/platform_device.h>
#include <linux/printk.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 5a1bf501fbe1..21d21b8291ef 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -10,7 +10,7 @@
#include <linux/kernel.h>
#include <linux/reboot.h>
#include <linux/delay.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/tty.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 8fd7cbf3bd04..66c2d563c094 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -13,7 +13,7 @@
#include <linux/kernel.h>
#include <linux/reboot.h>
#include <linux/delay.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/seq_file.h>
#include <linux/ioport.h>
#include <linux/console.h>
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 4e71dfe7d026..f434e6dc1921 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -22,7 +22,7 @@
#include <linux/stddef.h>
#include <linux/init.h>
#include <linux/highmem.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/pagemap.h>
#include <linux/memblock.h>
#include <linux/gfp.h>
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 0a161d82a3a8..e4222658ec2d 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -17,7 +17,7 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/root_dev.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/time.h>
#include <asm/io.h>
#include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index 2b5d187d9b62..b0426b35f9ed 100644
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -19,7 +19,7 @@
#include <linux/delay.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of.h>
#include <linux/of_address.h>
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index c19490cf6376..6b6c11931c1e 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -24,7 +24,7 @@
#include <linux/console.h>
#include <linux/delay.h>
#include <linux/seq_file.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/fsl_devices.h>
#include <linux/of.h>
#include <linux/of_address.h>
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index c1bfa4c3444c..00a6663a0a88 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -30,7 +30,7 @@
#include <linux/console.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/timer.h>
#include <linux/of_address.h>
#include <linux/of_fdt.h>
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 4012f206ec63..8e41d0fb0892 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -11,7 +11,7 @@
*/
#include <linux/kernel.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of_platform.h>
#include <linux/seq_file.h>
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index e49880e8dab8..df458828eb22 100644
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -13,7 +13,7 @@
#include <linux/kernel.h>
#include <linux/pci.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/of_platform.h>
#include <asm/time.h>
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 4c3b9ed5428d..ab0860868025 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -32,7 +32,7 @@
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/major.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/console.h>
#include <linux/pci.h>
#include <linux/adb.h>
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index b1c4876dadae..479a0861a93e 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -9,7 +9,7 @@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/memblock.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/swap.h>
#include <linux/swiotlb.h>
#include <linux/sizes.h>
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 9bdb6f6b893e..7ce009c2599d 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -33,7 +33,7 @@
#include <linux/ioport.h>
#include <linux/delay.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/root_dev.h>
#include <linux/console.h>
#include <linux/kernel_stat.h>
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index e4953453d254..e6556f9f2be3 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -27,7 +27,7 @@
#include <linux/memory.h>
#include <linux/pfn.h>
#include <linux/poison.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/export.h>
#include <linux/cma.h>
#include <linux/gfp.h>
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 9ce9dc5b9e56..814866e35120 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -9,7 +9,7 @@
*/
#include <linux/ioport.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/console.h>
#include <linux/root_dev.h>
#include <linux/utsname.h>
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index fb46fb3acf54..b3778d78bb78 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -14,7 +14,7 @@
#include <linux/unistd.h>
#include <linux/ptrace.h>
#include <linux/slab.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/smp.h>
#include <linux/user.h>
#include <linux/delay.h>
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 79b56613c6d8..02b16827b664 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -28,7 +28,7 @@
#include <linux/root_dev.h>
#include <linux/interrupt.h>
#include <linux/cpu.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/module.h>
#include <linux/start_kernel.h>
#include <linux/memblock.h>
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 7b7722ff5232..f04dd1d6f382 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -19,7 +19,7 @@
#include <linux/mman.h>
#include <linux/mm.h>
#include <linux/swap.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/init.h>
#include <linux/highmem.h>
#include <linux/memblock.h>
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index af249a654e79..b0fa82676e6f 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -14,7 +14,7 @@
#include <linux/memblock.h>
#include <linux/mm.h>
#include <linux/hugetlb.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/swap.h>
#include <linux/pagemap.h>
#include <linux/poison.h>
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index e6113192a6b6..99edfbd78c00 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -5,7 +5,7 @@
#include <linux/init.h>
#include <linux/memblock.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/types.h>
#include <init.h>
#include <os.h>
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 514f63340880..0086e285d60c 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -26,7 +26,7 @@
#include <linux/bsearch.h>
#include <linux/uaccess.h>
#include <linux/vmalloc.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/kernel.h>
#include <linux/pci.h>
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 371ca6eac00e..4bebf8b77542 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -14,7 +14,7 @@
#include <linux/earlycpio.h>
#include <linux/firmware.h>
#include <linux/uaccess.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/cpu.h>
diff --git a/arch/x86/kernel/cpu/microcode/internal.h b/arch/x86/kernel/cpu/microcode/internal.h
index 50a9702ae4e2..b4aec58af7e3 100644
--- a/arch/x86/kernel/cpu/microcode/internal.h
+++ b/arch/x86/kernel/cpu/microcode/internal.h
@@ -3,7 +3,7 @@
#define _X86_MICROCODE_INTERNAL_H
#include <linux/earlycpio.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/cpu.h>
#include <asm/microcode.h>
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index dd8748c45529..3eb6dad99288 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -16,7 +16,7 @@
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/of_pci.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <asm/irqdomain.h>
#include <asm/hpet.h>
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 167b9ef12ebb..3b88d156ed39 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -14,7 +14,7 @@
#include <linux/hugetlb.h>
#include <linux/ima.h>
#include <linux/init_ohci1394_dma.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/iscsi_ibft.h>
#include <linux/memblock.h>
#include <linux/panic_notifier.h>
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index c7ca996fb430..b7c45004f999 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -1,5 +1,5 @@
#include <linux/gfp.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/ioport.h>
#include <linux/swap.h>
#include <linux/memblock.h>
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 8a34fff6ab2b..d075d4178d36 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -27,7 +27,7 @@
#include <linux/memblock.h>
#include <linux/proc_fs.h>
#include <linux/memory_hotplug.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/cpumask.h>
#include <linux/gfp.h>
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index b9426fce5f3e..34fcb5b8f386 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -19,7 +19,7 @@
#include <linux/swap.h>
#include <linux/smp.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/pagemap.h>
#include <linux/memblock.h>
#include <linux/proc_fs.h>
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 37ad99c10ac4..4ecb6bf897fd 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -19,7 +19,7 @@
#include <linux/acpi.h>
#include <linux/memblock.h>
#include <linux/earlycpio.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/security.h>
#include <linux/kmemleak.h>
#include "internal.h"
diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index 6942c62fa59d..f32de7459e76 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -15,7 +15,7 @@
#include <linux/kernel_read_file.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/timer.h>
#include <linux/vmalloc.h>
#include <linux/interrupt.h>
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 05c4325904d2..a15b699d3a09 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -10,7 +10,7 @@
*/
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/major.h>
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 7cab72da2ea9..1dcaaea1dcfb 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -21,7 +21,7 @@
#include <linux/device.h>
#include <linux/efi.h>
#include <linux/of.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/io.h>
#include <linux/kexec.h>
#include <linux/platform_device.h>
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 127b37f211cb..2e73de8a1bbe 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -11,7 +11,7 @@
#include <linux/crash_dump.h>
#include <linux/crc32.h>
#include <linux/kernel.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/memblock.h>
#include <linux/mutex.h>
#include <linux/of.h>
diff --git a/include/linux/initrd.h b/include/linux/initramfs.h
similarity index 89%
rename from include/linux/initrd.h
rename to include/linux/initramfs.h
index 51c473b6a973..e9f523917a02 100644
--- a/include/linux/initrd.h
+++ b/include/linux/initramfs.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __LINUX_INITRD_H
-#define __LINUX_INITRD_H
+#ifndef __LINUX_INITRAMFS_H
+#define __LINUX_INITRAMFS_H
/* 1 if it is not an error if virt_external_initramfs_start < memory_start */
extern int initramfs_below_start_ok;
@@ -23,4 +23,4 @@ extern unsigned long phys_external_initramfs_size;
extern char __builtin_initramfs_start[];
extern unsigned long __builtin_initramfs_size;
-#endif /* __LINUX_INITRD_H */
+#endif /* __LINUX_INITRAMFS_H */
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 5b55d0035e03..2df33c573d9c 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/init_syscalls.h>
#include <linux/fs.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/async.h>
#include <linux/fs_struct.h>
#include <linux/slab.h>
diff --git a/init/initramfs.c b/init/initramfs.c
index a6c11260e62b..8b648b09247a 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -597,7 +597,7 @@ static int __init initramfs_async_setup(char *str)
}
__setup("initramfs_async=", initramfs_async_setup);
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/kexec.h>
unsigned long virt_external_initramfs_start, virt_external_initramfs_end;
diff --git a/init/main.c b/init/main.c
index f119460bf8e1..5186233c64fd 100644
--- a/init/main.c
+++ b/init/main.c
@@ -26,7 +26,7 @@
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/init.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/memblock.h>
#include <linux/acpi.h>
#include <linux/bootconfig.h>
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index cb6196e3fa99..3bf92703332b 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -12,7 +12,7 @@
#include <linux/kobject.h>
#include <linux/highuid.h>
#include <linux/writeback.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/times.h>
#include <linux/limits.h>
#include <linux/syscalls.h>
diff --git a/kernel/umh.c b/kernel/umh.c
index b4da45a3a7cf..c58b3e8e9256 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -26,7 +26,7 @@
#include <linux/ptrace.h>
#include <linux/async.h>
#include <linux/uaccess.h>
-#include <linux/initrd.h>
+#include <linux/initramfs.h>
#include <linux/freezer.h>
#include <trace/events/module.h>
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 43/62] setsid: inline ksys_setsid into the only caller
From: Askar Safin @ 2025-09-14 3:53 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
include/linux/syscalls.h | 1 -
kernel/sys.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 77f45e5d4413..75e9ee03d19b 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1231,7 +1231,6 @@ int ksys_fchown(unsigned int fd, uid_t user, gid_t group);
ssize_t ksys_read(unsigned int fd, char __user *buf, size_t count);
void ksys_sync(void);
int ksys_unshare(unsigned long unshare_flags);
-int ksys_setsid(void);
int ksys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
unsigned int flags);
ssize_t ksys_pread64(unsigned int fd, char __user *buf, size_t count,
diff --git a/kernel/sys.c b/kernel/sys.c
index 1e28b40053ce..66e1e2dfd585 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1265,7 +1265,7 @@ static void set_special_pids(struct pid **pids, struct pid *pid)
change_pid(pids, curr, PIDTYPE_PGID, pid);
}
-int ksys_setsid(void)
+SYSCALL_DEFINE0(setsid)
{
struct task_struct *group_leader = current->group_leader;
struct pid *sid = task_pid(group_leader);
@@ -1300,11 +1300,6 @@ int ksys_setsid(void)
return err;
}
-SYSCALL_DEFINE0(setsid)
-{
- return ksys_setsid();
-}
-
DECLARE_RWSEM(uts_sem);
#ifdef COMPAT_UTS_MACHINE
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 44/62] doc: kernel-parameters: remove [RAM] from reserve_mem=
From: Askar Safin @ 2025-09-14 3:54 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This parameter has nothing to do with ramdisk
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
Documentation/admin-guide/kernel-parameters.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a259f2bdba0f..0805d3ebc75a 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6277,8 +6277,7 @@
them. If <base> is less than 0x10000, the region
is assumed to be I/O ports; otherwise it is memory.
- reserve_mem= [RAM]
- Format: nn[KMG]:<align>:<label>
+ reserve_mem= Format: nn[KMG]:<align>:<label>
Reserve physical memory and label it with a name that
other subsystems can use to access it. This is typically
used for systems that do not wipe the RAM, and this command
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 45/62] doc: kernel-parameters: replace [RAM] with [INITRAMFS]
From: Askar Safin @ 2025-09-14 3:54 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
Also, do other initramfs-related edits, while we are here
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
.../admin-guide/kernel-parameters.rst | 4 ++--
.../admin-guide/kernel-parameters.txt | 20 +++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst
index 39d0e7ff0965..22af6bbffc35 100644
--- a/Documentation/admin-guide/kernel-parameters.rst
+++ b/Documentation/admin-guide/kernel-parameters.rst
@@ -123,7 +123,7 @@ is applicable::
CMA Contiguous Memory Area support is enabled.
DRM Direct Rendering Management support is enabled.
DYNAMIC_DEBUG Build in debug messages and enable them at runtime
- EARLY Parameter processed too early to be embedded in initrd.
+ EARLY Parameter processed too early to be embedded in initramfs.
EDD BIOS Enhanced Disk Drive Services (EDD) is enabled
EFI EFI Partitioning (GPT) is enabled
EVM Extended Verification Module
@@ -134,6 +134,7 @@ is applicable::
HW Appropriate hardware is enabled.
HYPER_V HYPERV support is enabled.
IMA Integrity measurement architecture is enabled.
+ INITRAMFS Initramfs support is enabled.
IP_PNP IP DHCP, BOOTP, or RARP is enabled.
IPV6 IPv6 support is enabled.
ISAPNP ISA PnP code is enabled.
@@ -167,7 +168,6 @@ is applicable::
PPT Parallel port support is enabled.
PS2 Appropriate PS/2 support is enabled.
PV_OPS A paravirtualized kernel is enabled.
- RAM RAM disk support is enabled.
RDT Intel Resource Director Technology.
RISCV RISCV architecture is enabled.
S390 S390 architecture is enabled.
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 0805d3ebc75a..8e10abac4cc7 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -565,7 +565,7 @@
Format: integer
bootconfig [KNL,EARLY]
- Extended command line options can be added to an initrd
+ Extended command line options can be added to an initramfs
and this will cause the kernel to look for it.
See Documentation/admin-guide/bootconfig.rst
@@ -1005,7 +1005,7 @@
may be missing from the dump.
A standard crashkernel reservation, as described above,
- is still needed to hold the crash kernel and initrd.
+ is still needed to hold the crash kernel and initramfs.
This option increases the risk of a kdump failure: DMA
transfers configured by the first kernel may end up
@@ -2298,7 +2298,7 @@
initcall functions. Useful for debugging built-in
modules and initcalls.
- initramfs_async= [KNL]
+ initramfs_async= [INITRAMFS,KNL]
Format: <bool>
Default: 1
This parameter controls whether the initramfs
@@ -2310,10 +2310,10 @@
unpacking being completed before device_ and
late_ initcalls.
- initrd= [BOOT,EARLY] Specify the location of the initial ramdisk
+ initrd= [BOOT,EARLY,INITRAMFS,KNL] Same as initrdmem=
- initrdmem= [KNL,EARLY] Specify a physical address and size from which to
- load the initrd. If an initrd is compiled in or
+ initrdmem= [BOOT,EARLY,INITRAMFS,KNL] Specify a physical address and size from which to
+ load initramfs. If initramfs is compiled in or
specified in the bootparams, it takes priority over this
setting.
Format: ss[KMG],nn[KMG]
@@ -2749,7 +2749,7 @@
between unregistering the boot console and initializing
the real console.
- keepinitrd [HW,ARM] See retain_initrd.
+ keepinitrd [HW,ARM,INITRAMFS] See retain_initrd.
kernelcore= [KNL,X86,PPC,EARLY]
Format: nn[KMGTPE] | nn% | "mirror"
@@ -6129,8 +6129,8 @@
rdinit= [KNL]
Format: <full_path>
- Run specified binary instead of /init from the ramdisk,
- used for early userspace startup. See initrd.
+ Run specified binary instead of /init from initramfs,
+ used for early userspace startup.
rdrand= [X86,EARLY]
force - Override the decision by the kernel to hide the
@@ -6324,7 +6324,7 @@
Useful for devices that are detected asynchronously
(e.g. USB and MMC devices).
- retain_initrd [RAM] Keep initrd memory after extraction. After boot, it will
+ retain_initrd [INITRAMFS] Keep initramfs memory after extraction. After boot, it will
be accessible via /sys/firmware/initrd.
retbleed= [X86] Control mitigation of RETBleed (Arbitrary
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 46/62] init: edit docs for initramfs-related configs
From: Askar Safin @ 2025-09-14 3:55 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
drivers/block/Kconfig | 7 ++-----
init/Kconfig | 18 +++++++-----------
usr/Kconfig | 42 +++++++++++++++++++++---------------------
3 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 8cf06e40f61c..a268ac3dd304 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -225,9 +225,7 @@ config BLK_DEV_RAM
Saying Y here will allow you to use a portion of your RAM memory as
a block device, so that you can make file systems on it, read and
write to it and do all the other things that you can do with normal
- block devices (such as hard drives). It is usually used to load and
- store a copy of a minimal root file system off of a floppy into RAM
- during the initial install of Linux.
+ block devices (such as hard drives).
For details, read <file:Documentation/admin-guide/blockdev/ramdisk.rst>.
@@ -244,8 +242,7 @@ config BLK_DEV_RAM_COUNT
depends on BLK_DEV_RAM
help
The default value is 16 RAM disks. Change this if you know what you
- are doing. If you boot from a filesystem that needs to be extracted
- in memory, you will need at least one RAM disk (e.g. root on cramfs).
+ are doing.
config BLK_DEV_RAM_SIZE
int "Default RAM disk size (kbytes)"
diff --git a/init/Kconfig b/init/Kconfig
index 0263c08960bc..1c371dca7fd4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1435,18 +1435,14 @@ config RELAY
If unsure, say N.
config BLK_DEV_INITRD
- bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
+ bool "Initial RAM filesystem (initramfs) support"
help
- The initial RAM filesystem is a ramfs which is loaded by the
- boot loader (loadlin or lilo) and that is mounted as root
+ The initial RAM filesystem is a ramfs or tmpfs which is loaded by the
+ boot loader and that is mounted as root
before the normal boot procedure. It is typically used to
load modules needed to mount the "real" root file system,
etc. See <file:Documentation/filesystems/ramfs-rootfs-initramfs.rst> for details.
- If RAM disk support (BLK_DEV_RAM) is also included, this
- also enables initial RAM disk (initrd) support and adds
- 15 Kbytes (more on some other architectures) to the kernel size.
-
If unsure say Y.
if BLK_DEV_INITRD
@@ -1485,8 +1481,8 @@ config BOOT_CONFIG_EMBED
depends on BOOT_CONFIG
help
Embed a bootconfig file given by BOOT_CONFIG_EMBED_FILE in the
- kernel. Usually, the bootconfig file is loaded with the initrd
- image. But if the system doesn't support initrd, this option will
+ kernel. Usually, the bootconfig file is loaded with the initramfs.
+ But if the system doesn't support initramfs, this option will
help you by embedding a bootconfig file while building the kernel.
If unsure, say N.
@@ -1496,8 +1492,8 @@ config BOOT_CONFIG_EMBED_FILE
depends on BOOT_CONFIG_EMBED
help
Specify a bootconfig file which will be embedded to the kernel.
- This bootconfig will be used if there is no initrd or no other
- bootconfig in the initrd.
+ This bootconfig will be used if there is no initramfs or no other
+ bootconfig in the initramfs.
config INITRAMFS_PRESERVE_MTIME
bool "Preserve cpio archive mtimes in initramfs"
diff --git a/usr/Kconfig b/usr/Kconfig
index 9279a2893ab0..8899353bd7d5 100644
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -27,7 +27,7 @@ config INITRAMFS_FORCE
depends on CMDLINE_EXTEND || CMDLINE_FORCE
help
This option causes the kernel to ignore the initramfs image
- (or initrd image) passed to it by the bootloader. This is
+ passed to it by the bootloader. This is
analogous to CMDLINE_FORCE, which is found on some architectures,
and is useful if you cannot or don't want to change the image
your bootloader passes to the kernel.
@@ -53,59 +53,59 @@ config INITRAMFS_ROOT_GID
If you are not sure, leave it set to "0".
config RD_GZIP
- bool "Support initial ramdisk/ramfs compressed using gzip"
+ bool "Support initial ramfs compressed using gzip"
default y
select DECOMPRESS_GZIP
help
- Support loading of a gzip encoded initial ramdisk or cpio buffer.
+ Support loading of a gzip encoded initial ramfs.
If unsure, say Y.
config RD_BZIP2
- bool "Support initial ramdisk/ramfs compressed using bzip2"
+ bool "Support initial ramfs compressed using bzip2"
default y
select DECOMPRESS_BZIP2
help
- Support loading of a bzip2 encoded initial ramdisk or cpio buffer
+ Support loading of a bzip2 encoded initial ramfs.
If unsure, say N.
config RD_LZMA
- bool "Support initial ramdisk/ramfs compressed using LZMA"
+ bool "Support initial ramfs compressed using LZMA"
default y
select DECOMPRESS_LZMA
help
- Support loading of a LZMA encoded initial ramdisk or cpio buffer
+ Support loading of a LZMA encoded initial ramfs.
If unsure, say N.
config RD_XZ
- bool "Support initial ramdisk/ramfs compressed using XZ"
+ bool "Support initial ramfs compressed using XZ"
default y
select DECOMPRESS_XZ
help
- Support loading of a XZ encoded initial ramdisk or cpio buffer.
+ Support loading of a XZ encoded initial ramfs.
If unsure, say N.
config RD_LZO
- bool "Support initial ramdisk/ramfs compressed using LZO"
+ bool "Support initial ramfs compressed using LZO"
default y
select DECOMPRESS_LZO
help
- Support loading of a LZO encoded initial ramdisk or cpio buffer
+ Support loading of a LZO encoded initial ramfs.
If unsure, say N.
config RD_LZ4
- bool "Support initial ramdisk/ramfs compressed using LZ4"
+ bool "Support initial ramfs compressed using LZ4"
default y
select DECOMPRESS_LZ4
help
- Support loading of a LZ4 encoded initial ramdisk or cpio buffer
+ Support loading of a LZ4 encoded initial ramfs.
If unsure, say N.
config RD_ZSTD
- bool "Support initial ramdisk/ramfs compressed using ZSTD"
+ bool "Support initial ramfs compressed using ZSTD"
default y
select DECOMPRESS_ZSTD
help
- Support loading of a ZSTD encoded initial ramdisk or cpio buffer.
+ Support loading of a ZSTD encoded initial ramfs.
If unsure, say N.
choice
@@ -127,7 +127,7 @@ choice
boot.
Keep in mind that your build system needs to provide the appropriate
- compression tool to compress the generated initram cpio file for
+ compression tool to compress the generated initramfs cpio file for
embedding.
If in doubt, select 'None'
@@ -153,7 +153,7 @@ config INITRAMFS_COMPRESSION_BZIP2
booting.
If you choose this, keep in mind that you need to have the bzip2 tool
- available to be able to compress the initram.
+ available to be able to compress the initramfs.
config INITRAMFS_COMPRESSION_LZMA
bool "LZMA"
@@ -166,7 +166,7 @@ config INITRAMFS_COMPRESSION_LZMA
comparison to gzip.
If you choose this, keep in mind that you may need to install the xz
- or lzma tools to be able to compress the initram.
+ or lzma tools to be able to compress the initramfs.
config INITRAMFS_COMPRESSION_XZ
bool "XZ"
@@ -179,7 +179,7 @@ config INITRAMFS_COMPRESSION_XZ
slow.
If you choose this, keep in mind that you may need to install the xz
- tool to be able to compress the initram.
+ tool to be able to compress the initramfs.
config INITRAMFS_COMPRESSION_LZO
bool "LZO"
@@ -191,7 +191,7 @@ config INITRAMFS_COMPRESSION_LZO
is quite fast too.
If you choose this, keep in mind that you may need to install the lzop
- tool to be able to compress the initram.
+ tool to be able to compress the initramfs.
config INITRAMFS_COMPRESSION_LZ4
bool "LZ4"
@@ -213,7 +213,7 @@ config INITRAMFS_COMPRESSION_ZSTD
decompress around the same speed as LZO, but slower than LZ4.
If you choose this, keep in mind that you may need to install the zstd
- tool to be able to compress the initram.
+ tool to be able to compress the initramfs.
config INITRAMFS_COMPRESSION_NONE
bool "None"
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 47/62] init: fix typo: virtul => virtual
From: Askar Safin @ 2025-09-14 3:55 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
Fix typo
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/initramfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init/initramfs.c b/init/initramfs.c
index 8b648b09247a..cf19b7c0c358 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -636,7 +636,7 @@ void __init reserve_initramfs_mem(void)
phys_addr_t start;
unsigned long size;
- /* Ignore the virtul address computed during device tree parsing */
+ /* Ignore the virtual address computed during device tree parsing */
virt_external_initramfs_start = virt_external_initramfs_end = 0;
if (!phys_external_initramfs_size)
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 48/62] init: fix comment
From: Askar Safin @ 2025-09-14 3:56 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
Make #endif match #ifdef
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/initramfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init/initramfs.c b/init/initramfs.c
index cf19b7c0c358..30e94ebf4902 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -717,7 +717,7 @@ static inline bool kexec_free_initrd(void)
{
return false;
}
-#endif /* CONFIG_KEXEC_CORE */
+#endif /* CONFIG_CRASH_RESERVE */
static void __init do_populate_rootfs(void *unused, async_cookie_t cookie)
{
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 49/62] init: rename ramdisk_execute_command to initramfs_execute_command
From: Askar Safin @ 2025-09-14 3:57 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/main.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/init/main.c b/init/main.c
index 5186233c64fd..cbebd64f523c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -160,7 +160,7 @@ static size_t initargs_offs;
#endif
static char *execute_command;
-static char *ramdisk_execute_command = "/init";
+static char *initramfs_execute_command = "/init";
/*
* Used to generate warnings if static_key manipulation functions are used
@@ -609,7 +609,7 @@ static int __init rdinit_setup(char *str)
{
unsigned int i;
- ramdisk_execute_command = str;
+ initramfs_execute_command = str;
/* See "auto" comment in init_setup */
for (i = 1; i < MAX_INIT_ARGS; i++)
argv_init[i] = NULL;
@@ -1491,12 +1491,12 @@ static int __ref kernel_init(void *unused)
do_sysctl_args();
- if (ramdisk_execute_command) {
- ret = run_init_process(ramdisk_execute_command);
+ if (initramfs_execute_command) {
+ ret = run_init_process(initramfs_execute_command);
if (!ret)
return 0;
pr_err("Failed to execute %s (error %d)\n",
- ramdisk_execute_command, ret);
+ initramfs_execute_command, ret);
}
/*
@@ -1588,11 +1588,11 @@ static noinline void __init kernel_init_freeable(void)
* the work
*/
int ramdisk_command_access;
- ramdisk_command_access = init_eaccess(ramdisk_execute_command);
+ ramdisk_command_access = init_eaccess(initramfs_execute_command);
if (ramdisk_command_access != 0) {
pr_warn("check access for rdinit=%s failed: %i, ignoring\n",
- ramdisk_execute_command, ramdisk_command_access);
- ramdisk_execute_command = NULL;
+ initramfs_execute_command, ramdisk_command_access);
+ initramfs_execute_command = NULL;
prepare_namespace();
}
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 50/62] init: rename ramdisk_command_access to initramfs_command_access
From: Askar Safin @ 2025-09-14 3:57 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/init/main.c b/init/main.c
index cbebd64f523c..a42f1f0fce84 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1587,11 +1587,11 @@ static noinline void __init kernel_init_freeable(void)
* check if there is an early userspace init. If yes, let it do all
* the work
*/
- int ramdisk_command_access;
- ramdisk_command_access = init_eaccess(initramfs_execute_command);
- if (ramdisk_command_access != 0) {
+ int initramfs_command_access;
+ initramfs_command_access = init_eaccess(initramfs_execute_command);
+ if (initramfs_command_access != 0) {
pr_warn("check access for rdinit=%s failed: %i, ignoring\n",
- initramfs_execute_command, ramdisk_command_access);
+ initramfs_execute_command, initramfs_command_access);
initramfs_execute_command = NULL;
prepare_namespace();
}
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 51/62] init: rename get_boot_config_from_initrd to get_boot_config_from_initramfs
From: Askar Safin @ 2025-09-14 3:58 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
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
^ permalink raw reply related
* [PATCH RESEND 52/62] init: rename do_retain_initrd to retain_initramfs
From: Askar Safin @ 2025-09-14 3:58 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/initramfs.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/init/initramfs.c b/init/initramfs.c
index 30e94ebf4902..40c8e4b05886 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -570,13 +570,13 @@ char * __init unpack_to_rootfs(char *buf, unsigned long len)
return message;
}
-static int __initdata do_retain_initrd;
+static int __initdata retain_initramfs;
static int __init retain_initrd_param(char *str)
{
if (*str)
return 0;
- do_retain_initrd = 1;
+ retain_initramfs = 1;
return 1;
}
__setup("retain_initrd", retain_initrd_param);
@@ -584,7 +584,7 @@ __setup("retain_initrd", retain_initrd_param);
#ifdef CONFIG_ARCH_HAS_KEEPINITRD
static int __init keepinitrd_setup(char *__unused)
{
- do_retain_initrd = 1;
+ retain_initramfs = 1;
return 1;
}
__setup("keepinitrd", keepinitrd_setup);
@@ -743,9 +743,9 @@ static void __init do_populate_rootfs(void *unused, async_cookie_t cookie)
* If the initrd region is overlapped with crashkernel reserved region,
* free only memory that is not part of crashkernel region.
*/
- if (!do_retain_initrd && virt_external_initramfs_start && !kexec_free_initrd()) {
+ if (!retain_initramfs && virt_external_initramfs_start && !kexec_free_initrd()) {
free_initramfs_mem(virt_external_initramfs_start, virt_external_initramfs_end);
- } else if (do_retain_initrd && virt_external_initramfs_start) {
+ } else if (retain_initramfs && virt_external_initramfs_start) {
bin_attr_initrd.size = virt_external_initramfs_end - virt_external_initramfs_start;
bin_attr_initrd.private = (void *)virt_external_initramfs_start;
if (sysfs_create_bin_file(firmware_kobj, &bin_attr_initrd))
--
2.47.2
^ permalink raw reply related
* [PATCH RESEND 53/62] init: rename kexec_free_initrd to kexec_free_initramfs
From: Askar Safin @ 2025-09-14 3:59 UTC (permalink / raw)
To: linux-fsdevel, linux-kernel
Cc: Linus Torvalds, Greg Kroah-Hartman, Christian Brauner, Al Viro,
Jan Kara, Christoph Hellwig, Jens Axboe, Andy Shevchenko,
Aleksa Sarai, Thomas Weißschuh, Julian Stecklina, Gao Xiang,
Art Nikpal, Andrew Morton, Eric Curtin, Alexander Graf,
Rob Landley, Lennart Poettering, linux-arch, linux-alpha,
linux-snps-arc, linux-arm-kernel, linux-csky, linux-hexagon,
loongarch, linux-m68k, linux-mips, linux-openrisc, linux-parisc,
linuxppc-dev, linux-riscv, linux-s390, linux-sh, sparclinux,
linux-um, x86, Ingo Molnar, linux-block, initramfs, linux-api,
linux-doc, linux-efi, linux-ext4, Theodore Y . Ts'o,
linux-acpi, Michal Simek, devicetree, Luis Chamberlain, Kees Cook,
Thorsten Blum, Heiko Carstens, patches
In-Reply-To: <20250913003842.41944-1-safinaskar@gmail.com>
This is cleanup after initrd removal
Signed-off-by: Askar Safin <safinaskar@gmail.com>
---
init/initramfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/init/initramfs.c b/init/initramfs.c
index 40c8e4b05886..d52314b17c25 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -690,7 +690,7 @@ void __weak __init free_initramfs_mem(unsigned long start, unsigned long end)
}
#ifdef CONFIG_CRASH_RESERVE
-static bool __init kexec_free_initrd(void)
+static bool __init kexec_free_initramfs(void)
{
unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
unsigned long crashk_end = (unsigned long)__va(crashk_res.end);
@@ -713,7 +713,7 @@ static bool __init kexec_free_initrd(void)
return true;
}
#else
-static inline bool kexec_free_initrd(void)
+static inline bool kexec_free_initramfs(void)
{
return false;
}
@@ -743,7 +743,7 @@ static void __init do_populate_rootfs(void *unused, async_cookie_t cookie)
* If the initrd region is overlapped with crashkernel reserved region,
* free only memory that is not part of crashkernel region.
*/
- if (!retain_initramfs && virt_external_initramfs_start && !kexec_free_initrd()) {
+ if (!retain_initramfs && virt_external_initramfs_start && !kexec_free_initramfs()) {
free_initramfs_mem(virt_external_initramfs_start, virt_external_initramfs_end);
} else if (retain_initramfs && virt_external_initramfs_start) {
bin_attr_initrd.size = virt_external_initramfs_end - virt_external_initramfs_start;
--
2.47.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox