diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-09-30 16:45:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-30 17:31:02 -0400 |
commit | 080506ad0aa9c9fbc7879cdd290d55624da08c60 (patch) | |
tree | 8a696742dcaaee55f1a9524b87be7dfa960eb3d6 | |
parent | eadb41ae82f802105c0601aa8a0a0e7595826497 (diff) |
block: change config option name for cmdline partition parsing
Recently commit bab55417b10c ("block: support embedded device command
line partition") introduced CONFIG_CMDLINE_PARSER. However, that name
is too generic and sounds like it enables/disables generic kernel boot
arg processing, when it really is block specific.
Before this option becomes a part of a full/final release, add the BLK_
prefix to it so that it is clear in absence of any other context that it
is block specific.
In addition, fix up the following less critical items:
- help text was not really at all helpful.
- index file for Documentation was not updated
- add the new arg to Documentation/kernel-parameters.txt
- clarify wording in source comments
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Cai Zhiyong <caizhiyong@huawei.com>
Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Documentation/block/00-INDEX | 2 | ||||
-rw-r--r-- | Documentation/block/cmdline-partition.txt | 8 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 4 | ||||
-rw-r--r-- | block/Kconfig | 9 | ||||
-rw-r--r-- | block/Makefile | 2 | ||||
-rw-r--r-- | block/partitions/Kconfig | 4 | ||||
-rw-r--r-- | block/partitions/cmdline.c | 8 |
7 files changed, 24 insertions, 13 deletions
diff --git a/Documentation/block/00-INDEX b/Documentation/block/00-INDEX index d18ecd827c40..929d9904f74b 100644 --- a/Documentation/block/00-INDEX +++ b/Documentation/block/00-INDEX | |||
@@ -6,6 +6,8 @@ capability.txt | |||
6 | - Generic Block Device Capability (/sys/block/<device>/capability) | 6 | - Generic Block Device Capability (/sys/block/<device>/capability) |
7 | cfq-iosched.txt | 7 | cfq-iosched.txt |
8 | - CFQ IO scheduler tunables | 8 | - CFQ IO scheduler tunables |
9 | cmdline-partition.txt | ||
10 | - how to specify block device partitions on kernel command line | ||
9 | data-integrity.txt | 11 | data-integrity.txt |
10 | - Block data integrity | 12 | - Block data integrity |
11 | deadline-iosched.txt | 13 | deadline-iosched.txt |
diff --git a/Documentation/block/cmdline-partition.txt b/Documentation/block/cmdline-partition.txt index 2bbf4cc40c3f..525b9f6d7fb4 100644 --- a/Documentation/block/cmdline-partition.txt +++ b/Documentation/block/cmdline-partition.txt | |||
@@ -1,9 +1,9 @@ | |||
1 | Embedded device command line partition | 1 | Embedded device command line partition parsing |
2 | ===================================================================== | 2 | ===================================================================== |
3 | 3 | ||
4 | Read block device partition table from command line. | 4 | Support for reading the block device partition table from the command line. |
5 | The partition used for fixed block device (eMMC) embedded device. | 5 | It is typically used for fixed block (eMMC) embedded devices. |
6 | It is no MBR, save storage space. Bootloader can be easily accessed | 6 | It has no MBR, so saves storage space. Bootloader can be easily accessed |
7 | by absolute address of data on the block device. | 7 | by absolute address of data on the block device. |
8 | Users can easily change the partition. | 8 | Users can easily change the partition. |
9 | 9 | ||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 73d23fdc512b..fcbb736d55fe 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -480,6 +480,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
480 | Format: <io>,<irq>,<mode> | 480 | Format: <io>,<irq>,<mode> |
481 | See header of drivers/net/hamradio/baycom_ser_hdx.c. | 481 | See header of drivers/net/hamradio/baycom_ser_hdx.c. |
482 | 482 | ||
483 | blkdevparts= Manual partition parsing of block device(s) for | ||
484 | embedded devices based on command line input. | ||
485 | See Documentation/block/cmdline-partition.txt | ||
486 | |||
483 | boot_delay= Milliseconds to delay each printk during boot. | 487 | boot_delay= Milliseconds to delay each printk during boot. |
484 | Values larger than 10 seconds (10000) are changed to | 488 | Values larger than 10 seconds (10000) are changed to |
485 | no delay (0). | 489 | no delay (0). |
diff --git a/block/Kconfig b/block/Kconfig index 7f38e40fee08..2429515c05c2 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
@@ -99,11 +99,16 @@ config BLK_DEV_THROTTLING | |||
99 | 99 | ||
100 | See Documentation/cgroups/blkio-controller.txt for more information. | 100 | See Documentation/cgroups/blkio-controller.txt for more information. |
101 | 101 | ||
102 | config CMDLINE_PARSER | 102 | config BLK_CMDLINE_PARSER |
103 | bool "Block device command line partition parser" | 103 | bool "Block device command line partition parser" |
104 | default n | 104 | default n |
105 | ---help--- | 105 | ---help--- |
106 | Parsing command line, get the partitions information. | 106 | Enabling this option allows you to specify the partition layout from |
107 | the kernel boot args. This is typically of use for embedded devices | ||
108 | which don't otherwise have any standardized method for listing the | ||
109 | partitions on a block device. | ||
110 | |||
111 | See Documentation/block/cmdline-partition.txt for more information. | ||
107 | 112 | ||
108 | menu "Partition Types" | 113 | menu "Partition Types" |
109 | 114 | ||
diff --git a/block/Makefile b/block/Makefile index 4fa4be544ece..671a83d063a5 100644 --- a/block/Makefile +++ b/block/Makefile | |||
@@ -18,4 +18,4 @@ obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o | |||
18 | 18 | ||
19 | obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o | 19 | obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o |
20 | obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o | 20 | obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o |
21 | obj-$(CONFIG_CMDLINE_PARSER) += cmdline-parser.o | 21 | obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o |
diff --git a/block/partitions/Kconfig b/block/partitions/Kconfig index 87a32086535d..9b29a996c311 100644 --- a/block/partitions/Kconfig +++ b/block/partitions/Kconfig | |||
@@ -263,7 +263,7 @@ config SYSV68_PARTITION | |||
263 | 263 | ||
264 | config CMDLINE_PARTITION | 264 | config CMDLINE_PARTITION |
265 | bool "Command line partition support" if PARTITION_ADVANCED | 265 | bool "Command line partition support" if PARTITION_ADVANCED |
266 | select CMDLINE_PARSER | 266 | select BLK_CMDLINE_PARSER |
267 | help | 267 | help |
268 | Say Y here if you would read the partitions table from bootargs. | 268 | Say Y here if you want to read the partition table from bootargs. |
269 | The format for the command line is just like mtdparts. | 269 | The format for the command line is just like mtdparts. |
diff --git a/block/partitions/cmdline.c b/block/partitions/cmdline.c index 56cf4ffad51e..5141b563adf1 100644 --- a/block/partitions/cmdline.c +++ b/block/partitions/cmdline.c | |||
@@ -2,15 +2,15 @@ | |||
2 | * Copyright (C) 2013 HUAWEI | 2 | * Copyright (C) 2013 HUAWEI |
3 | * Author: Cai Zhiyong <caizhiyong@huawei.com> | 3 | * Author: Cai Zhiyong <caizhiyong@huawei.com> |
4 | * | 4 | * |
5 | * Read block device partition table from command line. | 5 | * Read block device partition table from the command line. |
6 | * The partition used for fixed block device (eMMC) embedded device. | 6 | * Typically used for fixed block (eMMC) embedded devices. |
7 | * It is no MBR, save storage space. Bootloader can be easily accessed | 7 | * It has no MBR, so saves storage space. Bootloader can be easily accessed |
8 | * by absolute address of data on the block device. | 8 | * by absolute address of data on the block device. |
9 | * Users can easily change the partition. | 9 | * Users can easily change the partition. |
10 | * | 10 | * |
11 | * The format for the command line is just like mtdparts. | 11 | * The format for the command line is just like mtdparts. |
12 | * | 12 | * |
13 | * Verbose config please reference "Documentation/block/cmdline-partition.txt" | 13 | * For further information, see "Documentation/block/cmdline-partition.txt" |
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||