From 49a913ff4663b165ed459016256880dde52d60e6 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Sun, 20 Jul 2008 13:07:09 -0700
Subject: [PATCH] --- yaml --- r: 114266 b: refs/heads/master c:
 589f800bb12c5cd6c9167bbf9bf3cb70cd8e422c h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/init/do_mounts_md.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index be956d1fd3a4..a0c10fc27423 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bd9890e94627bc1ef372085e64dda7f9e307e82
+refs/heads/master: 589f800bb12c5cd6c9167bbf9bf3cb70cd8e422c
diff --git a/trunk/init/do_mounts_md.c b/trunk/init/do_mounts_md.c
index 693d24694a6c..c0412a9dc003 100644
--- a/trunk/init/do_mounts_md.c
+++ b/trunk/init/do_mounts_md.c
@@ -267,9 +267,16 @@ __setup("md=", md_setup);
 void __init md_run_setup(void)
 {
 	create_dev("/dev/md0", MKDEV(MD_MAJOR, 0));
+
 	if (raid_noautodetect)
 		printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n");
 	else {
+		/* 
+		 * Since we don't want to detect and use half a raid array, we need to
+		 * wait for the known devices to complete their probing
+		 */
+		while (driver_probe_done() != 0)
+			msleep(100);
 		int fd = sys_open("/dev/md0", 0, 0);
 		if (fd >= 0) {
 			sys_ioctl(fd, RAID_AUTORUN, raid_autopart);