From 0a6ae363de563a6049e1ec4f256ba103dd7de74b Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 19 Mar 2008 14:25:54 -0300
Subject: [PATCH] --- yaml --- r: 88839 b: refs/heads/master c:
 071782692798d7a6e0a5679f3186ea7fea49fd62 h: refs/heads/master i:   88837:
 92b9738753550fbeb9f2ee713925580a2749c10d   88835:
 0220f5fc225fa3900fec918a9ddbb84f11d6b64a   88831:
 1c4cf3aaafa5540de766ecfe9e82666a5a9568f9 v: v3

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

diff --git a/[refs] b/[refs]
index 0a0134d00b32..1298aa60517b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6bc40290964b5fcb48c226ccafa4b7536d62663
+refs/heads/master: 071782692798d7a6e0a5679f3186ea7fea49fd62
diff --git a/trunk/arch/x86/kernel/smpboot_64.c b/trunk/arch/x86/kernel/smpboot_64.c
index 8a59fa80f883..7ec96218a97e 100644
--- a/trunk/arch/x86/kernel/smpboot_64.c
+++ b/trunk/arch/x86/kernel/smpboot_64.c
@@ -63,6 +63,7 @@
 #include <mach_wakecpu.h>
 #include <mach_apic.h>
 #include <smpboot_hooks.h>
+#include <mach_apic.h>
 
 /* Set when the idlers are all forked */
 int smp_threads_ready;
@@ -293,7 +294,8 @@ static void __inquire_remote_apic(int apicid)
 /*
  * Kick the secondary to wake up.
  */
-static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int start_rip)
+static int __cpuinit wakeup_secondary_cpu(int phys_apicid,
+					  unsigned int start_rip)
 {
 	unsigned long send_status, accept_status = 0;
 	int maxlvt, num_starts, j;
@@ -534,7 +536,7 @@ static int __cpuinit do_boot_cpu(int cpu, int apicid)
 	/*
 	 * Starting actual IPI sequence...
 	 */
-	boot_error = wakeup_secondary_via_INIT(apicid, start_rip);
+	boot_error = wakeup_secondary_cpu(apicid, start_rip);
 
 	if (!boot_error) {
 		/*