Re: [PATCH 2/2] init/do_mounts.c: replace polling for root device with devtmpfs_wait_for_dev v1

[Greg KH <greg@kroah.com>]

On Thu, Aug 06, 2009 at 05:40:42PM +0800, tom.leiming@gmail.com wrote:
> From: Ming Lei <tom.leiming@gmail.com>
> 
> This patch removes the polling for root device if rootwait parameter is
> passed to kernel and CONFIG_DEVTMPFS is enabled. This way can lead to
> a faster boot, especially booting from some asynchronous block device
> (such as usb mass storage, mmc card, ...)
> 
> The patch has been verified in beagle board(mmc card as root device).
> 
> Signed-off-by: Ming Lei <tom.leiming@gmail.com>
> ---
>  init/do_mounts.c |   16 ++++++++++++++++
>  1 files changed, 16 insertions(+), 0 deletions(-)
> 
> diff --git a/init/do_mounts.c b/init/do_mounts.c
> index aa56007..46f0248 100644
> --- a/init/do_mounts.c
> +++ b/init/do_mounts.c
> @@ -364,6 +364,7 @@ void __init mount_root(void)
>  void __init prepare_namespace(void)
>  {
>  	int is_floppy;
> +	int ret;
>  
>  	if (root_delay) {
>  		printk(KERN_INFO "Waiting %dsec before mounting root device...\n",
> @@ -371,6 +372,7 @@ void __init prepare_namespace(void)
>  		ssleep(root_delay);
>  	}
>  
> +#ifndef CONFIG_DEVTMPFS
>  	/*
>  	 * wait for the known devices to complete their probing
>  	 *
> @@ -379,6 +381,7 @@ void __init prepare_namespace(void)
>  	 * for the touchpad of a laptop to initialize.
>  	 */
>  	wait_for_device_probe();
> +#endif

Any way to do this without the #ifdef mess in the file?  That's pretty
ugly, and hard to maintain.

thanks,

greg k-h