aboutsummaryrefslogtreecommitdiff
path: root/init/main.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-04 20:20:10 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-04 20:20:10 +0100
commit6d2e91bf80e4410207f01edb0962aec9213f3533 (patch)
treed9e63711b0958748accff409596eca742a3c360b /init/main.c
parent6298e719cf388f43b674f43799af467d3e4e5aa7 (diff)
parentdd39ecf522ba86c70809715af46e6557f6491131 (diff)
Merge branch 'x86/urgent' into x86/mm
Conflicts: arch/x86/include/asm/fixmap_64.h Semantic merge: arch/x86/include/asm/fixmap.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 6441083f827..6bf83afd654 100644
--- 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();