diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:25:54 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:02 -0400 |
commit | 071782692798d7a6e0a5679f3186ea7fea49fd62 (patch) | |
tree | 93e8f7010a95643089e3e90641d0cd2dd1b62e7e /arch/x86/kernel/smpboot_64.c | |
parent | f6bc40290964b5fcb48c226ccafa4b7536d62663 (diff) |
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>
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
-rw-r--r-- | arch/x86/kernel/smpboot_64.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index 8a59fa80f883..7ec96218a97e 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c | |||
@@ -63,6 +63,7 @@ | |||
63 | #include <mach_wakecpu.h> | 63 | #include <mach_wakecpu.h> |
64 | #include <mach_apic.h> | 64 | #include <mach_apic.h> |
65 | #include <smpboot_hooks.h> | 65 | #include <smpboot_hooks.h> |
66 | #include <mach_apic.h> | ||
66 | 67 | ||
67 | /* Set when the idlers are all forked */ | 68 | /* Set when the idlers are all forked */ |
68 | int smp_threads_ready; | 69 | int smp_threads_ready; |
@@ -293,7 +294,8 @@ static void __inquire_remote_apic(int apicid) | |||
293 | /* | 294 | /* |
294 | * Kick the secondary to wake up. | 295 | * Kick the secondary to wake up. |
295 | */ | 296 | */ |
296 | static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int start_rip) | 297 | static int __cpuinit wakeup_secondary_cpu(int phys_apicid, |
298 | unsigned int start_rip) | ||
297 | { | 299 | { |
298 | unsigned long send_status, accept_status = 0; | 300 | unsigned long send_status, accept_status = 0; |
299 | int maxlvt, num_starts, j; | 301 | int maxlvt, num_starts, j; |
@@ -534,7 +536,7 @@ do_rest: | |||
534 | /* | 536 | /* |
535 | * Starting actual IPI sequence... | 537 | * Starting actual IPI sequence... |
536 | */ | 538 | */ |
537 | boot_error = wakeup_secondary_via_INIT(apicid, start_rip); | 539 | boot_error = wakeup_secondary_cpu(apicid, start_rip); |
538 | 540 | ||
539 | if (!boot_error) { | 541 | if (!boot_error) { |
540 | /* | 542 | /* |