summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-03 14:12:59 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:40:56 +0200
commit1452207689b3c0dd2ffed40735289a3a4a8c0c7c (patch)
tree098e5b305974127c864276e636ad174846bbcfed
parenta355352b97901d987f54ea7c7d7161eb51a3799c (diff)
x86: make set_cpu_sibling_map nonstatic
And move its extern definition to smp.h, the common header Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/smpboot_64.c2
-rw-r--r--include/asm-x86/smp.h3
-rw-r--r--include/asm-x86/smp_32.h3
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index c51279f05316..1e8f00a1d624 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -228,7 +228,7 @@ cpumask_t cpu_coregroup_map(int cpu)
/* representing cpus for which sibling maps can be computed */
static cpumask_t cpu_sibling_setup_map;
-static inline void set_cpu_sibling_map(int cpu)
+void __cpuinit set_cpu_sibling_map(int cpu)
{
int i;
struct cpuinfo_x86 *c = &cpu_data(cpu);
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 2ab8ed4e99e0..1b4481aeb5c8 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -22,6 +22,9 @@ struct smp_ops {
int wait);
};
+/* Globals due to paravirt */
+extern void set_cpu_sibling_map(int cpu);
+
#ifdef CONFIG_SMP
extern struct smp_ops smp_ops;
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 29f61952ea8c..76247a947a5f 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -35,9 +35,6 @@ extern void cpu_uninit(void);
extern void remove_siblinginfo(int cpu);
#endif
-/* Globals due to paravirt */
-extern void set_cpu_sibling_map(int cpu);
-
#ifdef CONFIG_SMP
#ifndef CONFIG_PARAVIRT
#define startup_ipi_hook(phys_apicid, start_eip, start_esp) do { } while (0)