Remove final traces of long-deprecated "ramdisk" kernel parm

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@mindspring.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index eb247997f6791fa535b0bcec101cfa658634d3ba..a0ed205e53518ff5d3d56b2a56ded8079f5af9e2 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1473,14 +1473,10 @@ and is between 256 and 4096 characters. It is defined in the file
        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 --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
index 59108cebe163aadb1c6c1dd903b8b93ff15be51a..8a523f6af48ab754ad1fc51dc9a65d726bde9c23 100644 (file)
--- a/Documentation/m68k/kernel-options.txt
+++ b/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 --git a/Documentation/ramdisk.txt b/Documentation/ramdisk.txt
index 33e987df071ea050f8f6cfa56f642e6dc88b6968..6c820baa19a6edb3a4bc5127d884377ebcd36b60 100644 (file)
--- a/Documentation/ramdisk.txt
+++ b/Documentation/ramdisk.txt
@@ -31,13 +31,6 @@ To use RAM disk support with your system, run './MAKEDEV ram' from the /dev
 directory.  RAM disks are all major number 1, and 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.
-There are also config symbols (in the Block drivers config menu) for these
-variables:  BLK_DEV_RAM_SIZE defaults to 4096 and BLK_DEV_RAM_BLOCKSIZE
-defaults to 1024.
-
 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 --git a/drivers/block/rd.c b/drivers/block/rd.c
index 80e1585b741e5bb3307d1c538d88ed9ab2772b6b..08176d23a46cd421690aca1d13a2edecf1499b71 100644 (file)
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -504,17 +504,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