diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-04 23:59:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-04 23:59:54 -0800 |
commit | 77827a7cf3aa415f8afec6d9d0537dda8de90ef1 (patch) | |
tree | 503ab81e2b997e3625360b380f1cd18f923a6454 /init | |
parent | 9d40bbda599def1e1d155d7f7dca14fe8744bd2b (diff) | |
parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 844209453c02..83697e160b3a 100644 --- a/init/main.c +++ b/init/main.c @@ -97,7 +97,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); /* @@ -463,6 +463,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(); |