From 27c82fcf8a5b578fda37b35aaee18d1d4cac71c8 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 9 Nov 2007 22:39:39 +0100
Subject: [PATCH] --- yaml --- r: 73409 b: refs/heads/master c:
 e6fe6649b4ec11aa3075e394b4d8743eebe1f64c h: refs/heads/master i:   73407:
 56ec095321a04670553efb4a9fe1f6a2558de5ab v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 8 ++++++++
 trunk/init/main.c           | 4 +---
 trunk/kernel/sched.c        | 4 +---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 54db32ade746..8a7d1b37a90a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b82d9fdd848abfbe7263a4ecd9bbb55e575100a6
+refs/heads/master: e6fe6649b4ec11aa3075e394b4d8743eebe1f64c
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 2cc789fef711..ee800e7a70de 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1988,6 +1988,14 @@ static inline void inc_syscw(struct task_struct *tsk)
 }
 #endif
 
+#ifdef CONFIG_SMP
+void migration_init(void);
+#else
+static inline void migration_init(void)
+{
+}
+#endif
+
 #endif /* __KERNEL__ */
 
 #endif
diff --git a/trunk/init/main.c b/trunk/init/main.c
index f605a969ea61..80b04b6c5157 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -56,6 +56,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/device.h>
 #include <linux/kthread.h>
+#include <linux/sched.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -747,11 +748,8 @@ __setup("nosoftlockup", nosoftlockup_setup);
 static void __init do_pre_smp_initcalls(void)
 {
 	extern int spawn_ksoftirqd(void);
-#ifdef CONFIG_SMP
-	extern int migration_init(void);
 
 	migration_init();
-#endif
 	spawn_ksoftirqd();
 	if (!nosoftlockup)
 		spawn_softlockup_task();
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index e195a4229418..b18f231a4875 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -5650,7 +5650,7 @@ static struct notifier_block __cpuinitdata migration_notifier = {
 	.priority = 10
 };
 
-int __init migration_init(void)
+void __init migration_init(void)
 {
 	void *cpu = (void *)(long)smp_processor_id();
 	int err;
@@ -5660,8 +5660,6 @@ int __init migration_init(void)
 	BUG_ON(err == NOTIFY_BAD);
 	migration_call(&migration_notifier, CPU_ONLINE, cpu);
 	register_cpu_notifier(&migration_notifier);
-
-	return 0;
 }
 #endif