Commit 7e1efc0c authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: unify extern masks declaration 



take them off smp_{32,64}.h and move to smp.h

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

include/asm-x86/smp.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -3,12 +3,24 @@ 
#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

#include <linux/cpumask.h>

#include <linux/cpumask.h>

#include <linux/init.h>

#include <linux/init.h>

#include <asm/percpu.h>





extern cpumask_t cpu_callout_map;

extern cpumask_t cpu_callout_map;





extern int smp_num_siblings;

extern int smp_num_siblings;

extern unsigned int num_processors;

extern unsigned int num_processors;





extern u16 x86_cpu_to_apicid_init[];

extern u16 x86_bios_cpu_apicid_init[];

extern void *x86_cpu_to_apicid_early_ptr;

extern void *x86_bios_cpu_apicid_early_ptr;



DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_core_map);

DECLARE_PER_CPU(u16, cpu_llc_id);

DECLARE_PER_CPU(u16, x86_cpu_to_apicid);

DECLARE_PER_CPU(u16, x86_bios_cpu_apicid);



/*

/*

 * Trampoline 80x86 program as an array.

 * Trampoline 80x86 program as an array.

 */

 */

include/asm-x86/smp_32.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -21,14 +21,6 @@ extern cpumask_t cpu_callin_map; 
extern void (*mtrr_hook) (void);

extern void (*mtrr_hook) (void);

extern void zap_low_mappings (void);

extern void zap_low_mappings (void);





extern u16 __initdata x86_cpu_to_apicid_init[];

extern void *x86_cpu_to_apicid_early_ptr;



DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_core_map);

DECLARE_PER_CPU(u16, cpu_llc_id);

DECLARE_PER_CPU(u16, x86_cpu_to_apicid);



#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

/*

/*

 * This function is needed by all SMP systems. It must _always_ be valid

 * This function is needed by all SMP systems. It must _always_ be valid

include/asm-x86/smp_64.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -19,17 +19,6 @@ extern cpumask_t cpu_callin_map; 
extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),

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

				  void *info, int wait);

				  void *info, int wait);





extern u16 __initdata x86_cpu_to_apicid_init[];

extern u16 __initdata x86_bios_cpu_apicid_init[];

extern void *x86_cpu_to_apicid_early_ptr;

extern void *x86_bios_cpu_apicid_early_ptr;



DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_core_map);

DECLARE_PER_CPU(u16, cpu_llc_id);

DECLARE_PER_CPU(u16, x86_cpu_to_apicid);

DECLARE_PER_CPU(u16, x86_bios_cpu_apicid);



static inline int cpu_present_to_apicid(int mps_cpu)

static inline int cpu_present_to_apicid(int mps_cpu)

{

{

	if (cpu_present(mps_cpu))

	if (cpu_present(mps_cpu))