From 4233c247079209108682e45ffbf97f3dd7764e44 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 25 Mar 2009 17:06:30 +0800
Subject: [PATCH] --- yaml --- r: 141040 b: refs/heads/master c:
 759ee0915dd713361e72facb78b66600b5712d65 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/init/main.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bacb3ae0ef3a..d7d61b22a0bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f63b840bc8a816ac879ee773b035cf3e433fae4
+refs/heads/master: 759ee0915dd713361e72facb78b66600b5712d65
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 20d784ab5ef8..b0097d2b63ae 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -772,6 +772,7 @@ static void __init do_basic_setup(void)
 {
 	rcu_init_sched(); /* needed by module_init stage. */
 	init_workqueues();
+	cpuset_init_smp();
 	usermodehelper_init();
 	driver_init();
 	init_irq_proc();
@@ -865,8 +866,6 @@ static int __init kernel_init(void * unused)
 	smp_init();
 	sched_init_smp();
 
-	cpuset_init_smp();
-
 	do_basic_setup();
 
 	/*