aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-09-01 07:44:35 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 02:56:11 -0400
commit55dc7db70a73a3809a2334063c9b5b0d8ccebdaa (patch)
treee0e52ad2a0e6d3142945346f5acd7979c2b10e8d
parent2bbedcb4c1abac498f18e5770d62ae66ff235ada (diff)
init: DEBUG_BLOCK_EXT_DEVT requires explicit root= param
DEBUG_BLOCK_EXT_DEVT shuffles SCSI and IDE device numbers and root device number set using rdev become meaningless. Root devices should be explicitly specified using textual names. Warn about it if root can't be found and DEBUG_BLOCK_EXT_DEVT is enabled. Also, add warning to the help text. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--init/do_mounts.c4
-rw-r--r--lib/Kconfig.debug6
2 files changed, 10 insertions, 0 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 3715feb8446d..d055b1914c3d 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -263,6 +263,10 @@ retry:
263 printk("Please append a correct \"root=\" boot option; here are the available partitions:\n"); 263 printk("Please append a correct \"root=\" boot option; here are the available partitions:\n");
264 264
265 printk_all_partitions(); 265 printk_all_partitions();
266#ifdef CONFIG_DEBUG_BLOCK_EXT_DEVT
267 printk("DEBUG_BLOCK_EXT_DEVT is enabled, you need to specify "
268 "explicit textual name for \"root=\" boot option.\n");
269#endif
266 panic("VFS: Unable to mount root fs on %s", b); 270 panic("VFS: Unable to mount root fs on %s", b);
267 } 271 }
268 272
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 4378d5e923ca..c556896abe57 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -638,6 +638,12 @@ config DEBUG_BLOCK_EXT_DEVT
638 userland code paths which assume predetermined contiguous 638 userland code paths which assume predetermined contiguous
639 device number allocation. 639 device number allocation.
640 640
641 Note that turning on this debug option shuffles all the
642 device numbers for all IDE and SCSI devices including libata
643 ones, so root partition specified using device number
644 directly (via rdev or root=MAJ:MIN) won't work anymore.
645 Textual device names (root=/dev/sdXn) will continue to work.
646
641 Say N if you are unsure. 647 Say N if you are unsure.
642 648
643config LKDTM 649config LKDTM