---

yaml --- r: 120909 b: refs/heads/master c: f632ddc h: refs/heads/master i: 120907: 7a86aea v: v3
git-mirror · Nov 18, 2008 · de3b569 · de3b569
1 parent bfbf92b
commit de3b569
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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;