diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:31:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:31:34 -0400 |
commit | 9dbdd6c41c12fb42ee7188eafa7e1917b192af3a (patch) | |
tree | 06a9eb894bc976c5c20e84ccd74fd82b9b71aed4 /init | |
parent | 7a693d3f0d10f978ebdf3082c41404ab97106567 (diff) | |
parent | 161291396e76e0832c08f617eb9bd364d1648148 (diff) |
Merge commit 'v2.6.32-rc4' into perf/core
Merge reason: we were on an -rc1 base, merge up to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 7449819a4805..5988debfc505 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -778,7 +778,6 @@ static void __init do_initcalls(void) | |||
778 | */ | 778 | */ |
779 | static void __init do_basic_setup(void) | 779 | static void __init do_basic_setup(void) |
780 | { | 780 | { |
781 | rcu_init_sched(); /* needed by module_init stage. */ | ||
782 | init_workqueues(); | 781 | init_workqueues(); |
783 | cpuset_init_smp(); | 782 | cpuset_init_smp(); |
784 | usermodehelper_init(); | 783 | usermodehelper_init(); |