diff options
| author | Robert Elliott <elliott@hpe.com> | 2015-12-23 18:28:49 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2015-12-26 05:22:00 -0700 |
| commit | b03539665d4bd4bdb2a7dd5f65cdbd7a24cc3f1c (patch) | |
| tree | 1778b88474c470003d447f529b52e0919eb106e1 | |
| parent | 563c17cb20831d818fb27eedb7b3e883cd756135 (diff) | |
| download | lwn-b03539665d4bd4bdb2a7dd5f65cdbd7a24cc3f1c.tar.gz lwn-b03539665d4bd4bdb2a7dd5f65cdbd7a24cc3f1c.zip | |
init, Documentation: Remove ramdisk_blocksize mentions
The brd driver has never supported the ramdisk_blocksize kernel
parameter that was in the rd driver it replaced, so remove
mention of this parameter from comments and Documentation.
Commit 9db5579be4bb ("rewrite rd") replaced rd with brd, keeping
a brd_blocksize variable in struct brd_device but never using it.
Commit a2cba2913c76 ("brd: get rid of unused members from struct
brd_device") removed the unused variable.
Commit f5abc8e75815 ("Documentation/blockdev/ramdisk.txt: updates")
removed mentions of ramdisk_blocksize from that file.
Signed-off-by: Robert Elliott <elliott@hpe.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 | ||||
| -rw-r--r-- | init/do_mounts_rd.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index f8aae632f02f..9b2970fd237b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -3053,9 +3053,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. raid= [HW,RAID] See Documentation/md.txt. - ramdisk_blocksize= [RAM] - See Documentation/blockdev/ramdisk.txt. - ramdisk_size= [RAM] Sizes of RAM disks in kilobytes See Documentation/blockdev/ramdisk.txt. diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index e5d059e8aa11..8a09b32e07d6 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c @@ -216,13 +216,6 @@ int __init rd_load_image(char *from) /* * NOTE NOTE: nblocks is not actually blocks but * the number of kibibytes of data to load into a ramdisk. - * So any ramdisk block size that is a multiple of 1KiB should - * work when the appropriate ramdisk_blocksize is specified - * on the command line. - * - * The default ramdisk_blocksize is 1KiB and it is generally - * silly to use anything else, so make sure to use 1KiB - * blocksize while generating ext2fs ramdisk-images. */ if (sys_ioctl(out_fd, BLKGETSIZE, (unsigned long)&rd_blocks) < 0) rd_blocks = 0; |