init: remove deprecated "load_ramdisk" and "prompt_ramdisk" command line parameters

...which do nothing. They were deprecated (in documentation) in
6b99e6e6aa62 ("Documentation/admin-guide: blockdev/ramdisk: remove use of
"rdev"") in 2020 and in kernel messages in c8376994c86c ("initrd: remove
support for multiple floppies") in 2020.

Signed-off-by: Askar Safin <safinaskar@gmail.com>
Link: https://patch.msgid.link/20251119222407.3333257-2-safinaskar@gmail.com
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a8d0afde7f85a506b827ae31d48fc5d9dbabc095..4bdf6a158181e815aea4ee7dbc68ade484b12134 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3437,8 +3437,6 @@ Kernel parameters
                        If there are multiple matching configurations changing
                        the same attribute, the last one is used.
 
-       load_ramdisk=   [RAM] [Deprecated]
-
        lockd.nlm_grace_period=P  [NFS] Assign grace period.
                        Format: <integer>
 
@@ -5402,8 +5400,6 @@ Kernel parameters
                        Param: <number> - step/bucket size as a power of 2 for
                                statistical time based profiling.
 
-       prompt_ramdisk= [RAM] [Deprecated]
-
        prot_virt=      [S390] enable hosting protected virtual machines
                        isolated from the hypervisor (if hardware supports
                        that). If enabled, the default kernel base address

diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig
index 2227f86100ad25c99b8eea9a4cd87297c9337ae1..4d720001c12efe372596c0752f03160038c52c7e 100644 (file)
--- a/arch/arm/configs/neponset_defconfig
+++ b/arch/arm/configs/neponset_defconfig
@@ -9,7 +9,7 @@ CONFIG_ASSABET_NEPONSET=y
 CONFIG_ZBOOT_ROM_TEXT=0x80000
 CONFIG_ZBOOT_ROM_BSS=0xc1000000
 CONFIG_ZBOOT_ROM=y
-CONFIG_CMDLINE="console=ttySA0,38400n8 cpufreq=221200 rw root=/dev/mtdblock2 mtdparts=sa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) load_ramdisk=1 prompt_ramdisk=0 mem=32M noinitrd initrd=0xc0800000,3M"
+CONFIG_CMDLINE="console=ttySA0,38400n8 cpufreq=221200 rw root=/dev/mtdblock2 mtdparts=sa1100:512K(boot),1M(kernel),2560K(initrd),4M(root) mem=32M noinitrd initrd=0xc0800000,3M"
 CONFIG_FPE_NWFPE=y
 CONFIG_PM=y
 CONFIG_MODULES=y

diff --git a/init/do_mounts.c b/init/do_mounts.c
index defbbf1d55f768ec0c646d543928dba4878d8bfa..3b9f0d9216583936c410260361924b4351f880f1 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -34,13 +34,6 @@ static int root_wait;
 
 dev_t ROOT_DEV;
 
-static int __init load_ramdisk(char *str)
-{
-       pr_warn("ignoring the deprecated load_ramdisk= option\n");
-       return 1;
-}
-__setup("load_ramdisk=", load_ramdisk);
-
 static int __init readonly(char *str)
 {
        if (*str)

diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index eddbe5cb0413a79a9059d1d64cac94da7c1da833..d20fabf2227fd12e9e084232a2f4cbd5e4688bfa 100644 (file)
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -18,13 +18,6 @@
 static struct file *in_file, *out_file;
 static loff_t in_pos, out_pos;
 
-static int __init prompt_ramdisk(char *str)
-{
-       pr_warn("ignoring the deprecated prompt_ramdisk= option\n");
-       return 1;
-}
-__setup("prompt_ramdisk=", prompt_ramdisk);
-
 int __initdata rd_image_start;         /* starting block # of image */
 
 static int __init ramdisk_start_setup(char *str)