mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
This commit is contained in:
commit
a7f4463e03
126 changed files with 3469 additions and 1059 deletions
|
|
@ -370,10 +370,14 @@ void __init prepare_namespace(void)
|
|||
ssleep(root_delay);
|
||||
}
|
||||
|
||||
/* wait for the known devices to complete their probing */
|
||||
while (driver_probe_done() != 0)
|
||||
msleep(100);
|
||||
async_synchronize_full();
|
||||
/*
|
||||
* 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();
|
||||
|
||||
|
|
@ -399,6 +403,7 @@ void __init prepare_namespace(void)
|
|||
while (driver_probe_done() != 0 ||
|
||||
(ROOT_DEV = name_to_dev_t(saved_root_name)) == 0)
|
||||
msleep(100);
|
||||
async_synchronize_full();
|
||||
}
|
||||
|
||||
is_floppy = MAJOR(ROOT_DEV) == FLOPPY_MAJOR;
|
||||
|
|
|
|||
|
|
@ -281,8 +281,9 @@ static void __init autodetect_raid(void)
|
|||
*/
|
||||
printk(KERN_INFO "md: Waiting for all devices to be available before autodetect\n");
|
||||
printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n");
|
||||
while (driver_probe_done() < 0)
|
||||
msleep(100);
|
||||
|
||||
wait_for_device_probe();
|
||||
|
||||
fd = sys_open("/dev/md0", 0, 0);
|
||||
if (fd >= 0) {
|
||||
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
|
||||
|
|
|
|||
Loading…
Reference in a new issue