[PATCH] drivers: wait for threaded probes between initcall levels

The multithreaded-probing code has a problem: after one initcall level (eg,
core_initcall) has been processed, we will then start processing the next
level (postcore_initcall) while the kernel threads which are handling
core_initcall are still executing.  This breaks the guarantees which the
layered initcalls previously gave us.

IOW, we want to be multithreaded _within_ an initcall level, but not between
different levels.

Fix that up by causing the probing code to wait for all outstanding probes at
one level to complete before we start processing the next level.

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index e3e83bcaf71..9d873163a7a 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -216,10 +216,17 @@
 
 #define INITCALLS                                                       \
         *(.initcall1.init)                                              \
+        *(.initcall1s.init)                                             \
         *(.initcall2.init)                                              \
+        *(.initcall2s.init)                                             \
         *(.initcall3.init)                                              \
+        *(.initcall3s.init)                                             \
         *(.initcall4.init)                                              \
+        *(.initcall4s.init)                                             \
         *(.initcall5.init)                                              \
+        *(.initcall5s.init)                                             \
         *(.initcall6.init)                                              \
-        *(.initcall7.init)
+        *(.initcall6s.init)                                             \
+        *(.initcall7.init)                                              \
+        *(.initcall7s.init)