From de3b569f3d0e5d25754f37b9a5aec8761ad767e3 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 18 Nov 2008 17:32:26 +0100
Subject: [PATCH] --- yaml --- r: 120909 b: refs/heads/master c:
 f632ddcc0786149c0e4bef9b6b44c96a75c0d074 h: refs/heads/master i:   120907:
 7a86aea27cb06a8cbe743d3433d94dc737fb9bbd v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8cd42db8c82b..e85ab3e88a0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54ac14a8e982ae6c7ac71ee2b0d0173b974509e2
+refs/heads/master: f632ddcc0786149c0e4bef9b6b44c96a75c0d074
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index c366e891e10b..31328909456e 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/arch/x86/kernel/setup.c
@@ -585,8 +585,10 @@ early_param("elfcorehdr", setup_elfcorehdr);
 
 static int __init default_update_genapic(void)
 {
-#if defined(CONFIG_X86_GENERICARCH) || defined(CONFIG_X86_64)
-	genapic->wakeup_cpu = wakeup_secondary_cpu_via_nmi;
+#ifdef CONFIG_X86_SMP
+# if defined(CONFIG_X86_GENERICARCH) || defined(CONFIG_X86_64)
+	genapic->wakeup_cpu = wakeup_secondary_cpu_via_init;
+# endif
 #endif
 
 	return 0;