Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 0 deletions

diff --git a/init/main.c b/init/main.c
index f7fb20021d48..edeace036fd9 100644
--- a/init/main.c
+++ b/init/main.c
@@ -31,6 +31,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/start_kernel.h>
 #include <linux/security.h>
+#include <linux/smp.h>
 #include <linux/workqueue.h>
 #include <linux/profile.h>
 #include <linux/rcupdate.h>
@@ -758,6 +759,7 @@ static void __init do_initcalls(void)
  */
 static void __init do_basic_setup(void)
 {
+        rcu_init_sched(); /* needed by module_init stage. */
         /* drivers will send hotplug events */
         init_workqueues();
         usermodehelper_init();
@@ -779,6 +781,7 @@ static void __init do_pre_smp_initcalls(void)
 {
         extern int spawn_ksoftirqd(void);
 
+        init_call_single_data();
         migration_init();
         spawn_ksoftirqd();
         if (!nosoftlockup)