aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-12-15 15:02:27 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2010-12-22 13:54:19 -0800
commitb16ec3dc2da6583afd646ab4df5faad40519f7da (patch)
treec7c19e1156f7196b710d0d16bfadf4cba863acb7
parent6feab6ac0822a0a17ee1b52dd6bc73759e850794 (diff)
downloadmrst-s0i3-test-b16ec3dc2da6583afd646ab4df5faad40519f7da.tar.gz
mrst-s0i3-test-b16ec3dc2da6583afd646ab4df5faad40519f7da.tar.xz
mrst-s0i3-test-b16ec3dc2da6583afd646ab4df5faad40519f7da.zip
Revert "x86, smpboot: unstatic wake_secondary_cpu_via_init()"
This reverts commit d8f2d950c7a4b073521a4022ba0ad2c814bda3b5. We don't actually need wakeup_secondary_cpu_via_init() global, only wakeup_secondary_cpu_via_init_delays(); this avoids a function call in the common case since wakeup_secondary_cpu_via_init() can be trivially inlined. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/include/asm/apic.h1
-rw-r--r--arch/x86/kernel/smpboot.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 52ecbcfd367..c6d46a59db1 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -375,7 +375,6 @@ struct init_wakeup_delays {
unsigned long icr_accept;
unsigned long cpu_accept;
};
-extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
extern int wakeup_secondary_cpu_via_init_delays(int apicid,
unsigned long start_eip, const struct init_wakeup_delays *);
#endif
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 51934b761fb..f2ed5feb635 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -580,7 +580,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip)
return (send_status | accept_status);
}
-int __cpuinit
+static int __cpuinit
wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
{
static const struct init_wakeup_delays delays =