...which do nothing. They were deprecated (in documentation) in 6b99e6e6aa62 ("Documentation/admin-guide: blockdev/ramdisk: remove use of "rdev"") and in kernel messages in c8376994c86c ("initrd: remove support for multiple floppies") Signed-off-by: Askar Safin --- Documentation/admin-guide/kernel-parameters.txt | 4 ---- arch/arm/configs/neponset_defconfig | 2 +- init/do_mounts.c | 7 ------- init/do_mounts_rd.c | 7 ------- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index e019db1633fd..521ab3425504 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3280,8 +3280,6 @@ 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: @@ -5245,8 +5243,6 @@ Param: - 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 2227f86100ad..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) 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 6af29da8889e..0f2f44e6250c 100644 --- 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 19d9f33dcacf..5311f2d7edc8 100644 --- 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) -- 2.47.3