Paul Gortmaker 8ba4caf1ee Revert "init: make rootdelay=N consistent with rootwait behaviour" ... This reverts commit 4dfe694f61. In that, we did: Here we move the rootdelay code to be right beside the rootwait code, so that their behaviour is consistent. ...which is fine, but in hindsight, perhaps moving the rootwait to be beside the rootdelay would have been better. We also indicated: It should be noted that in doing so, the actions based on the saved_root_name[0] and initrd_load() were previously put on hold by rootdelay=N and now currently will not be delayed. However, I think consistent behaviour is more important than matching historical behaviour of delaying the above two operations. But Pavel reported an instance where an ARM target with root on MMC was failing to mount root, and Russell diagnosed it to the fact that the call to set ROOT_DEV within the saved_root_name[0] processing block mentioned above was no longer being delayed. Rather than moving both wait clauses to the original position of rootdelay and risking unearthing other possible corner case breakage at this point in time, we simply revert now and we can revisit trying the alternate/earlier location in another development cycle. Cc: Pavel Machek <pavel@denx.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2014-09-17 08:02:07 -07:00
..
Kconfig	mm: fix CROSS_MEMORY_ATTACH help text grammar	2014-08-14 10:56:15 -06:00
Makefile	init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK	2012-05-05 13:00:46 +02:00
calibrate.c	kernel: add calibration_delay_done()	2014-06-16 12:47:39 -06:00
do_mounts.c	Revert "init: make rootdelay=N consistent with rootwait behaviour"	2014-09-17 08:02:07 -07:00
do_mounts.h	md: move lots of #include lines out of .h files and into .c	2009-03-31 14:33:13 +11:00
do_mounts_initrd.c	usermodehelper: split remaining calls to call_usermodehelper_fns()	2013-04-30 17:04:06 -07:00
do_mounts_md.c	init: disable sparse checking of the mount.o source files	2012-05-31 17:49:27 -07:00
do_mounts_rd.c	initramfs: support initramfs that is bigger than 2GiB	2014-08-08 15:57:26 -07:00
init_task.c	sched/rt: Move rt specific bits into new header file	2013-02-07 20:51:08 +01:00
initramfs.c	initramfs: add write error checks	2014-08-08 15:57:26 -07:00
main.c	init/main.c: code clean-up	2014-08-08 15:57:27 -07:00
noinitramfs.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
version.c	proc: Split the namespace stuff out into linux/proc_ns.h	2013-05-01 17:29:39 -04:00