Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core

[deliverable/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index db7974ff7a0ac22d592b750528bb47d5ffb26697..082077af7c445c087cf57d37923cc47c40e3dc81 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -98,7 +98,7 @@ static inline void mark_rodata_ro(void) { }
 extern void tc_init(void);
 #endif
 
-enum system_states system_state;
+enum system_states system_state __read_mostly;
 EXPORT_SYMBOL(system_state);
 
 /*
@@ -464,6 +464,7 @@ static noinline void __init_refok rest_init(void)
         * at least once to get things moving:
         */
        init_idle_bootup_task(current);
+       rcu_scheduler_starting();
        preempt_enable_no_resched();
        schedule();
        preempt_disable();