Merge branch 'x86/urgent' into x86/mm

[linux-2.6.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 6441083f827355108980280d7c7dd08f1ec16f5e..6bf83afd654da44b5b52383a4697d4d98e0ff6fa 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
 
 extern void tc_init(void);
 #endif
 

-enum system_states system_state;
+enum system_states system_state __read_mostly;

 EXPORT_SYMBOL(system_state);
 
 /*
 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);
         * at least once to get things moving:
         */
        init_idle_bootup_task(current);

+       rcu_scheduler_starting();

        preempt_enable_no_resched();
        schedule();
        preempt_disable();
        preempt_enable_no_resched();
        schedule();
        preempt_disable();