The patch titled
Remove final traces of long-deprecated "ramdisk" kernel parm
has been added to the -mm tree. Its filename is
remove-final-traces-of-long-deprecated-ramdisk-kernel.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Remove final traces of long-deprecated "ramdisk" kernel parm
From: "Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx>
Since the "ramdisk" kernel parameter has been officially deprecated
since at least 2.6.18, might as well finally get rid of it.
Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/kernel-parameters.txt | 4 ----
Documentation/m68k/kernel-options.txt | 4 ++--
Documentation/ramdisk.txt | 4 ----
drivers/block/rd.c | 7 +------
4 files changed, 3 insertions(+), 16 deletions(-)
diff -puN Documentation/kernel-parameters.txt~remove-final-traces-of-long-deprecated-ramdisk-kernel Documentation/kernel-parameters.txt
--- a/Documentation/kernel-parameters.txt~remove-final-traces-of-long-deprecated-ramdisk-kernel
+++ a/Documentation/kernel-parameters.txt
@@ -1497,14 +1497,10 @@ and is between 256 and 4096 characters.
raid= [HW,RAID]
See Documentation/md.txt.
- ramdisk= [RAM] Sizes of RAM disks in kilobytes [deprecated]
- See Documentation/ramdisk.txt.
-
ramdisk_blocksize= [RAM]
See Documentation/ramdisk.txt.
ramdisk_size= [RAM] Sizes of RAM disks in kilobytes
- New name for the ramdisk parameter.
See Documentation/ramdisk.txt.
rcu.blimit= [KNL,BOOT] Set maximum number of finished
diff -puN Documentation/m68k/kernel-options.txt~remove-final-traces-of-long-deprecated-ramdisk-kernel Documentation/m68k/kernel-options.txt
--- a/Documentation/m68k/kernel-options.txt~remove-final-traces-of-long-deprecated-ramdisk-kernel
+++ a/Documentation/m68k/kernel-options.txt
@@ -192,10 +192,10 @@ Devices possible for Atari:
seconds.
-2.6) ramdisk=
+2.6) ramdisk_size=
-------------
-Syntax: ramdisk=<size>
+Syntax: ramdisk_size=<size>
This option instructs the kernel to set up a ramdisk of the given
size in KBytes. Do not use this option if the ramdisk contents are
diff -puN Documentation/ramdisk.txt~remove-final-traces-of-long-deprecated-ramdisk-kernel Documentation/ramdisk.txt
--- a/Documentation/ramdisk.txt~remove-final-traces-of-long-deprecated-ramdisk-kernel
+++ a/Documentation/ramdisk.txt
@@ -29,10 +29,6 @@ in drivers/block/rd.c. To use RAM disk
start with minor number 0 for /dev/ram0, etc. If used, modern kernels use
/dev/ram0 for an initrd.
-The old "ramdisk=<ram_size>" has been changed to "ramdisk_size=<ram_size>" to
-make it clearer. The original "ramdisk=<ram_size>" has been kept around for
-compatibility reasons, but it may be removed in the future.
-
The new RAM disk also has the ability to load compressed RAM disk images,
allowing one to squeeze more programs onto an average installation or
rescue floppy disk.
diff -puN drivers/block/rd.c~remove-final-traces-of-long-deprecated-ramdisk-kernel drivers/block/rd.c
--- a/drivers/block/rd.c~remove-final-traces-of-long-deprecated-ramdisk-kernel
+++ a/drivers/block/rd.c
@@ -486,17 +486,12 @@ static int __init ramdisk_size(char *str
rd_size = simple_strtol(str,NULL,0);
return 1;
}
-static int __init ramdisk_size2(char *str) /* kludge */
-{
- return ramdisk_size(str);
-}
static int __init ramdisk_blocksize(char *str)
{
rd_blocksize = simple_strtol(str,NULL,0);
return 1;
}
-__setup("ramdisk=", ramdisk_size);
-__setup("ramdisk_size=", ramdisk_size2);
+__setup("ramdisk_size=", ramdisk_size);
__setup("ramdisk_blocksize=", ramdisk_blocksize);
#endif
_
Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are
git-kvm.patch
git-mtd.patch
pcmcia-delete-obsolete-pcmcia_ioctl-feature.patch
remove-dead-references-to-module_parm-macro.patch
m68knommu-remove-unused-config-symbol-config_disktel.patch
force-erroneous-inclusions-of-compiler-h-files-to-be-errors.patch
force-erroneous-inclusions-of-compiler-h-files-to-be-errors-fix.patch
kconfig-make-instrumentation-support-non-experimental.patch
remove-superfluous-definition-of-__setup_null_param-macro-and-broken-for-module-__setup_param.patch
remove-valueless-definition-of-hard-selected-ramfs-option.patch
remove-final-traces-of-long-deprecated-ramdisk-kernel.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
