Index: linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S =================================================================== --- linux-2.6.31.5.orig/arch/x86/kernel/vmlinux.lds.S 2009-10-23 00:57:56.000000000 +0200 +++ linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S 2009-11-07 14:31:54.000000000 +0100 @@ -244,6 +244,12 @@ __initcall_end = .; } + .root_initcall.init : AT(ADDR(.root_initcall.init) - LOAD_OFFSET) { + __root_initcall_start = .; + INITCALLS_ROOT + __root_initcall_end = .; + } + .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) { __con_initcall_start = .; *(.con_initcall.init) Index: linux-2.6.31.5/drivers/mtd/devices/block2mtd.c =================================================================== --- linux-2.6.31.5.orig/drivers/mtd/devices/block2mtd.c 2009-11-07 14:30:57.000000000 +0100 +++ linux-2.6.31.5/drivers/mtd/devices/block2mtd.c 2009-11-07 14:31:19.000000000 +0100 @@ -18,10 +18,18 @@ #include #include #include +#include +#include #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args) #define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args) +struct retry { + struct list_head list; + const char *val; +}; + +static LIST_HEAD(retry_list); /* Info for the block device */ struct block2mtd_dev { @@ -33,10 +41,34 @@ char devname[0]; }; +static int block2mtd_setup2(const char *val); /* Static info about the MTD, used in cleanup_module */ static LIST_HEAD(blkmtd_device_list); +static int add_retry(const char *val) { + struct retry *r = kmalloc(sizeof(struct retry), GFP_KERNEL); + + INIT_LIST_HEAD(&r->list); + r->val = val; + list_add(&r->list, &retry_list); + + return 0; +} + +static int __init process_retries(void) { + struct list_head *p, *tmp; + + list_for_each_safe(p, tmp, &retry_list) { + struct retry *r = list_entry(p, struct retry, list); + block2mtd_setup2(r->val); + msleep(100); + list_del(p); + kfree(r); + } + return 0; +} +rootfs_initcall(process_retries); static struct page *page_read(struct address_space *mapping, int index) { @@ -511,7 +543,9 @@ if (token[2] && (strlen(token[2]) + 1 > 80)) parse_err("mtd device name too long"); - add_device(name, erase_size, token[2]); + if (add_device(name, erase_size, token[2]) == NULL) { + add_retry(val); + } return 0; } Index: linux-2.6.31.5/include/asm-generic/vmlinux.lds.h =================================================================== --- linux-2.6.31.5.orig/include/asm-generic/vmlinux.lds.h 2009-11-07 14:30:57.000000000 +0100 +++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h 2009-11-07 14:31:19.000000000 +0100 @@ -622,12 +622,14 @@ *(.initcall4s.init) \ *(.initcall5.init) \ *(.initcall5s.init) \ - *(.initcallrootfs.init) \ *(.initcall6.init) \ *(.initcall6s.init) \ *(.initcall7.init) \ *(.initcall7s.init) +#define INITCALLS_ROOT \ + *(.initcallrootfs.init) + #define INIT_CALLS \ VMLINUX_SYMBOL(__initcall_start) = .; \ INITCALLS \ Index: linux-2.6.31.5/init/do_mounts.c =================================================================== --- linux-2.6.31.5.orig/init/do_mounts.c 2009-10-23 00:57:56.000000000 +0200 +++ linux-2.6.31.5/init/do_mounts.c 2009-11-07 14:31:19.000000000 +0100 @@ -176,16 +176,8 @@ return 1; } -static unsigned int __initdata root_delay; -static int __init root_delay_setup(char *str) -{ - root_delay = simple_strtoul(str, NULL, 0); - return 1; -} - __setup("rootflags=", root_data_setup); __setup("rootfstype=", fs_names_setup); -__setup("rootdelay=", root_delay_setup); static void __init get_fs_names(char *page) { @@ -366,23 +358,6 @@ { int is_floppy; - if (root_delay) { - printk(KERN_INFO "Waiting %dsec before mounting root device...\n", - root_delay); - ssleep(root_delay); - } - - /* - * wait for the known devices to complete their probing - * - * Note: this is a potential source of long boot delays. - * For example, it is not atypical to wait 5 seconds here - * for the touchpad of a laptop to initialize. - */ - wait_for_device_probe(); - - md_run_setup(); - if (saved_root_name[0]) { root_device_name = saved_root_name; if (!strncmp(root_device_name, "mtd", 3) || Index: linux-2.6.31.5/init/main.c =================================================================== --- linux-2.6.31.5.orig/init/main.c 2009-11-07 14:30:59.000000000 +0100 +++ linux-2.6.31.5/init/main.c 2009-11-07 14:31:19.000000000 +0100 @@ -79,6 +79,7 @@ #ifdef CONFIG_X86_LOCAL_APIC #include #endif +#include "do_mounts.h" static int kernel_init(void *); @@ -784,12 +785,13 @@ extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[]; +extern initcall_t __root_initcall_start[], __root_initcall_end[]; -static void __init do_initcalls(void) +static void __init do_initcalls(initcall_t *start, initcall_t *end) { initcall_t *call; - for (call = __early_initcall_end; call < __initcall_end; call++) + for (call = start; call < end; call++) do_one_initcall(*call); /* Make sure there is no pending stuff from the initcall sequence */ @@ -812,7 +814,7 @@ driver_init(); init_irq_proc(); do_ctors(); - do_initcalls(); + do_initcalls(__early_initcall_end, __initcall_end); } static void __init do_pre_smp_initcalls(void) @@ -873,6 +875,13 @@ panic("No init found. Try passing init= option to kernel."); } +static unsigned int __initdata root_delay; +static int __init root_delay_setup(char *str) +{ + root_delay = simple_strtoul(str, NULL, 0); + return 1; +} +__setup("rootdelay=", root_delay_setup); static int __init kernel_init(void * unused) { lock_kernel(); @@ -917,7 +926,16 @@ if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) { ramdisk_execute_command = NULL; - prepare_namespace(); + if (root_delay) { + printk(KERN_INFO "Waiting %desc before mounting root device...\n", + root_delay); + ssleep(root_delay); + } + while (driver_probe_done() != 0) + msleep(100); + md_run_setup(); + do_initcalls(__root_initcall_start, __root_initcall_end); + prepare_namespace(); } /*