Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Robert P. J. Day and committed by
Linus Torvalds
fac8b209 1810732e

+3 -19
-4
Documentation/kernel-parameters.txt
··· 1473 1473 raid= [HW,RAID] 1474 1474 See Documentation/md.txt. 1475 1475 1476 - ramdisk= [RAM] Sizes of RAM disks in kilobytes [deprecated] 1477 - See Documentation/ramdisk.txt. 1478 - 1479 1476 ramdisk_blocksize= [RAM] 1480 1477 See Documentation/ramdisk.txt. 1481 1478 1482 1479 ramdisk_size= [RAM] Sizes of RAM disks in kilobytes 1483 - New name for the ramdisk parameter. 1484 1480 See Documentation/ramdisk.txt. 1485 1481 1486 1482 rcu.blimit= [KNL,BOOT] Set maximum number of finished
+2 -2
Documentation/m68k/kernel-options.txt
··· 192 192 seconds. 193 193 194 194 195 - 2.6) ramdisk= 195 + 2.6) ramdisk_size= 196 196 ------------- 197 197 198 - Syntax: ramdisk=<size> 198 + Syntax: ramdisk_size=<size> 199 199 200 200 This option instructs the kernel to set up a ramdisk of the given 201 201 size in KBytes. Do not use this option if the ramdisk contents are
-7
Documentation/ramdisk.txt
··· 31 31 directory. RAM disks are all major number 1, and start with minor number 0 32 32 for /dev/ram0, etc. If used, modern kernels use /dev/ram0 for an initrd. 33 33 34 - The old "ramdisk=<ram_size>" has been changed to "ramdisk_size=<ram_size>" to 35 - make it clearer. The original "ramdisk=<ram_size>" has been kept around for 36 - compatibility reasons, but it may be removed in the future. 37 - There are also config symbols (in the Block drivers config menu) for these 38 - variables: BLK_DEV_RAM_SIZE defaults to 4096 and BLK_DEV_RAM_BLOCKSIZE 39 - defaults to 1024. 40 - 41 34 The new RAM disk also has the ability to load compressed RAM disk images, 42 35 allowing one to squeeze more programs onto an average installation or 43 36 rescue floppy disk.
+1 -6
drivers/block/rd.c
··· 504 504 rd_size = simple_strtol(str,NULL,0); 505 505 return 1; 506 506 } 507 - static int __init ramdisk_size2(char *str) /* kludge */ 508 - { 509 - return ramdisk_size(str); 510 - } 511 507 static int __init ramdisk_blocksize(char *str) 512 508 { 513 509 rd_blocksize = simple_strtol(str,NULL,0); 514 510 return 1; 515 511 } 516 - __setup("ramdisk=", ramdisk_size); 517 - __setup("ramdisk_size=", ramdisk_size2); 512 + __setup("ramdisk_size=", ramdisk_size); 518 513 __setup("ramdisk_blocksize=", ramdisk_blocksize); 519 514 #endif 520 515