From 7c76325573936234a442f980aef338e8d14d43ed Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Tue, 16 Oct 2007 23:29:30 -0700 Subject: [PATCH] --- yaml --- r: 70657 b: refs/heads/master c: fac8b209b1084bc85748bd54e13d00c1262b220f h: refs/heads/master i: 70655: 8cebdcc8a85483c6e710809fdb4e9f12dcac0e69 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 4 ---- trunk/Documentation/m68k/kernel-options.txt | 4 ++-- trunk/Documentation/ramdisk.txt | 7 ------- trunk/drivers/block/rd.c | 7 +------ 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index accda6dfb693..ed5c701e5cbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1810732e94576ae0d04e953ecaba8c7151c9a287 +refs/heads/master: fac8b209b1084bc85748bd54e13d00c1262b220f diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index eb247997f679..a0ed205e5351 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/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/trunk/Documentation/m68k/kernel-options.txt b/trunk/Documentation/m68k/kernel-options.txt index 59108cebe163..8a523f6af48a 100644 --- a/trunk/Documentation/m68k/kernel-options.txt +++ b/trunk/Documentation/m68k/kernel-options.txt @@ -192,10 +192,10 @@ Devices possible for Atari: seconds. -2.6) ramdisk= +2.6) ramdisk_size= ------------- -Syntax: ramdisk= +Syntax: ramdisk_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/trunk/Documentation/ramdisk.txt b/trunk/Documentation/ramdisk.txt index 33e987df071e..6c820baa19a6 100644 --- a/trunk/Documentation/ramdisk.txt +++ b/trunk/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=" has been changed to "ramdisk_size=" to -make it clearer. The original "ramdisk=" 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/trunk/drivers/block/rd.c b/trunk/drivers/block/rd.c index 80e1585b741e..08176d23a46c 100644 --- a/trunk/drivers/block/rd.c +++ b/trunk/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