---

yaml --- r: 366117 b: refs/heads/master c: a1a04ec h: refs/heads/master i: 366115: 3f0ed6d v: v3
git-mirror · Apr 8, 2013 · 924eb20 · 924eb20
1 parent 8534c6d
commit 924eb20
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a98f871ecaf44806e188184332c3fec27c8f08c
+refs/heads/master: a1a04ec3c7c27a682473fd9beb2c996316a64649
diff --git a/trunk/include/linux/cpu.h b/trunk/include/linux/cpu.h
@@ -212,4 +212,12 @@ static inline int disable_nonboot_cpus(void) { return 0; }
 static inline void enable_nonboot_cpus(void) {}
 #endif /* !CONFIG_PM_SLEEP_SMP */
 
+enum cpuhp_state {
+	CPUHP_OFFLINE,
+	CPUHP_ONLINE,
+};
+
+void cpu_startup_entry(enum cpuhp_state state);
+void cpu_idle(void);
+
 #endif /* _LINUX_CPU_H_ */
diff --git a/trunk/init/main.c b/trunk/init/main.c
@@ -384,7 +384,7 @@ static noinline void __init_refok rest_init(void)
 	init_idle_bootup_task(current);
 	schedule_preempt_disabled();
 	/* Call into cpu_idle with preempt disabled */
-	cpu_idle();
+	cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /* Check for early params. */

diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
@@ -24,6 +24,7 @@ endif
 
 obj-y += sched/
 obj-y += power/
+obj-y += cpu/
 
 obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
 obj-$(CONFIG_FREEZER) += freezer.o

diff --git a/trunk/kernel/cpu/Makefile b/trunk/kernel/cpu/Makefile
@@ -0,0 +1 @@
+obj-y	= idle.o
diff --git a/trunk/kernel/cpu/idle.c b/trunk/kernel/cpu/idle.c
@@ -0,0 +1,10 @@
+/*
+ * Generic entry point for the idle threads
+ */
+#include <linux/sched.h>
+#include <linux/cpu.h>
+
+void cpu_startup_entry(enum cpuhp_state state)
+{
+	cpu_idle();
+}