diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:59:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:59:10 +0100 |
| commit | 49d2d266adff27793fed247a2e9e672d59b6ddc6 (patch) | |
| tree | aa23052f8b6e9f1a96e56873c940eef7110f0013 /init | |
| parent | 5512b3ece0cbb5024b83099963222700aa45f59e (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
| download | linux-3.10-49d2d266adff27793fed247a2e9e672d59b6ddc6.tar.gz linux-3.10-49d2d266adff27793fed247a2e9e672d59b6ddc6.tar.bz2 linux-3.10-49d2d266adff27793fed247a2e9e672d59b6ddc6.zip | |
Merge commit 'v2.6.29-rc7' into sched/core
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 844209453c0..83697e160b3 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(); |