diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:48:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:48:50 +0100 |
| commit | a1413c89ae6a4b7a9a43f7768934a81ffb5c629a (patch) | |
| tree | 7e16be26407c5fd4dfbfeb98b11590809a963664 /init | |
| parent | f254f3909efaf59ca2d0f408de2d044dace60706 (diff) | |
| parent | dd4124a8a06bca89c077a16437edac010f0bb993 (diff) | |
| download | op-kernel-dev-a1413c89ae6a4b7a9a43f7768934a81ffb5c629a.zip op-kernel-dev-a1413c89ae6a4b7a9a43f7768934a81ffb5c629a.tar.gz | |
Merge branch 'x86/urgent' into x86/core
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')
| -rw-r--r-- | init/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 6441083..6bf83af 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(); |
