Commit:     fac8b209b1084bc85748bd54e13d00c1262b220f
Parent:     1810732e94576ae0d04e953ecaba8c7151c9a287
Author:     Robert P. J. Day <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:29:30 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:42:56 2007 -0700

    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 <[EMAIL PROTECTED]>
    Acked-by: Geert Uytterhoeven <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 Documentation/kernel-parameters.txt   |    4 ----
 Documentation/m68k/kernel-options.txt |    4 ++--
 Documentation/ramdisk.txt             |    7 -------
 drivers/block/rd.c                    |    7 +------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Documentation/kernel-parameters.txt 
index eb24799..a0ed205 100644
--- 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 
index 59108ce..8a523f6 100644
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
@@ -192,10 +192,10 @@ Devices possible for Atari:
-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 33e987d..6c820ba 100644
--- 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 80e1585..08176d2 100644
--- 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);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to