Le 13/09/2025 à 02:37, Askar Safin a écrit :
[Vous ne recevez pas souvent de courriers de safinas...@gmail.com. Découvrez 
pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ]

This is preparation for initrd removal

Squash patch 1 and patch 2 together and say this is cleanup of two options deprecated by commit c8376994c86c ("initrd: remove support for multiple floppies") with the documentation by commit 6b99e6e6aa62 ("Documentation/admin-guide: blockdev/ramdisk: remove use of "rdev"")

Christophe


Signed-off-by: Askar Safin <safinas...@gmail.com>
---
  Documentation/admin-guide/kernel-parameters.txt | 2 --
  arch/arm/configs/neponset_defconfig             | 2 +-
  init/do_mounts_rd.c                             | 7 -------
  3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Documentation/admin-guide/kernel-parameters.txt 
b/Documentation/admin-guide/kernel-parameters.txt
index d3b05ce249ff..f940c1184912 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5229,8 +5229,6 @@
                         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 16f7300239da..4d720001c12e 100644
--- 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) 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_rd.c b/init/do_mounts_rd.c
index ac021ae6e6fa..f7d53bc21e41 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -17,13 +17,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)
--
2.47.2




Reply via email to