summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 17:25:54 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-04-17 15:41:02 (GMT)
commit071782692798d7a6e0a5679f3186ea7fea49fd62 (patch)
tree93e8f7010a95643089e3e90641d0cd2dd1b62e7e
parentf6bc40290964b5fcb48c226ccafa4b7536d62663 (diff)
downloadlinux-071782692798d7a6e0a5679f3186ea7fea49fd62.tar.xz
x86: change wakeup_secondary name
wakeup_secondary_via_INIT => wakeup_secondary_cpu. This is to match i386, where init is not always used. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/smpboot_64.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 8a59fa8..7ec9621 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/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 @@ do_rest:
/*
* Starting actual IPI sequence...
*/
- boot_error = wakeup_secondary_via_INIT(apicid, start_rip);
+ boot_error = wakeup_secondary_cpu(apicid, start_rip);
if (!boot_error) {
/*