Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a355352b authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: move equal types to common file 



move definitions that are now equal in type from
smpboot_{32,64}.c to smpboot.c

cpu_callin_map is put temporarily in smp_64.h (already
exists in smp_32.h), and will soon be merged.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5382e896

arch/x86/kernel/smpboot.c

+28 −0
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/smp.h>

#include <linux/module.h>



/* Number of siblings per CPU package */

int smp_num_siblings = 1;

EXPORT_SYMBOL(smp_num_siblings);



/* Last level cache ID of each logical CPU */

DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;



/* bitmap of online cpus */

cpumask_t cpu_online_map __read_mostly;

EXPORT_SYMBOL(cpu_online_map);



cpumask_t cpu_callin_map;

cpumask_t cpu_callout_map;

cpumask_t cpu_possible_map;

EXPORT_SYMBOL(cpu_possible_map);



/* representing HT siblings of each logical CPU */

DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);

EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);



/* representing HT and core siblings of each logical CPU */

DEFINE_PER_CPU(cpumask_t, cpu_core_map);

EXPORT_PER_CPU_SYMBOL(cpu_core_map);



/* Per CPU bogomips and other parameters */

DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);

EXPORT_PER_CPU_SYMBOL(cpu_info);

#ifdef CONFIG_HOTPLUG_CPU



int additional_cpus __initdata = -1;

arch/x86/kernel/smpboot_32.c

+0 −27
Original line number Diff line number Diff line
@@ -62,35 +62,8 @@ 
/* Set if we find a B stepping CPU */

static int __cpuinitdata smp_b_stepping;



/* Number of siblings per CPU package */

int smp_num_siblings = 1;

EXPORT_SYMBOL(smp_num_siblings);



/* Last level cache ID of each logical CPU */

DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;



/* representing HT siblings of each logical CPU */

DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);

EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);



/* representing HT and core siblings of each logical CPU */

DEFINE_PER_CPU(cpumask_t, cpu_core_map);

EXPORT_PER_CPU_SYMBOL(cpu_core_map);



/* bitmap of online cpus */

cpumask_t cpu_online_map __read_mostly;

EXPORT_SYMBOL(cpu_online_map);



cpumask_t cpu_callin_map;

cpumask_t cpu_callout_map;

cpumask_t cpu_possible_map;

EXPORT_SYMBOL(cpu_possible_map);

static cpumask_t smp_commenced_mask;



/* Per CPU bogomips and other parameters */

DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);

EXPORT_PER_CPU_SYMBOL(cpu_info);



/* which logical CPU number maps to which CPU (physical APIC ID) */

u16 x86_cpu_to_apicid_init[NR_CPUS] __initdata =

			{ [0 ... NR_CPUS-1] = BAD_APICID };

arch/x86/kernel/smpboot_64.c

+0 −33
Original line number Diff line number Diff line
@@ -60,42 +60,9 @@ 
#include <asm/hw_irq.h>

#include <asm/numa.h>



/* Number of siblings per CPU package */

int smp_num_siblings = 1;

EXPORT_SYMBOL(smp_num_siblings);



/* Last level cache ID of each logical CPU */

DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;



/* Bitmask of currently online CPUs */

cpumask_t cpu_online_map __read_mostly;



EXPORT_SYMBOL(cpu_online_map);



/*

 * Private maps to synchronize booting between AP and BP.

 * Probably not needed anymore, but it makes for easier debugging. -AK

 */

cpumask_t cpu_callin_map;

cpumask_t cpu_callout_map;

cpumask_t cpu_possible_map;

EXPORT_SYMBOL(cpu_possible_map);



/* Per CPU bogomips and other parameters */

DEFINE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);

EXPORT_PER_CPU_SYMBOL(cpu_info);



/* Set when the idlers are all forked */

int smp_threads_ready;



/* representing HT siblings of each logical CPU */

DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);

EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);



/* representing HT and core siblings of each logical CPU */

DEFINE_PER_CPU(cpumask_t, cpu_core_map);

EXPORT_PER_CPU_SYMBOL(cpu_core_map);



/*

 * Trampoline 80x86 program as an array.

 */

include/asm-x86/smp_64.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/thread_info.h>



extern cpumask_t cpu_initialized;

extern cpumask_t cpu_callin_map;



extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),

				  void *info, int wait);