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

x86: merge SMP definitions of smp.h 



we merge everything that is inside CONFIG_SMP
to smp.h. They differ a little bit, so we use
CONFIG_X86_32_SMP and CONFIG_X86_64_SMP as markers.

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

include/asm-x86/smp.h

+32 −1
Original line number Diff line number Diff line
@@ -126,8 +126,39 @@ extern unsigned long setup_trampoline(void); 


void smp_store_cpu_info(int id);

#define cpu_physical_id(cpu)	per_cpu(x86_cpu_to_apicid, cpu)

#else



/* We don't mark CPUs online until __cpu_up(), so we need another measure */

static inline int num_booting_cpus(void)

{

	return cpus_weight(cpu_callout_map);

}

#endif /* CONFIG_SMP */



#ifdef CONFIG_X86_32_SMP

/*

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

 * from the initial startup. We map APIC_BASE very early in page_setup(),

 * so this is correct in the x86 case.

 */

DECLARE_PER_CPU(int, cpu_number);

#define raw_smp_processor_id() (x86_read_percpu(cpu_number))

extern int safe_smp_processor_id(void);



#elif defined(CONFIG_X86_64_SMP)

#define raw_smp_processor_id()	read_pda(cpunumber)



#define stack_smp_processor_id()					\

({								\

	struct thread_info *ti;						\

	__asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK));	\

	ti->cpu;							\

})

#define safe_smp_processor_id()		smp_processor_id()



#else /* !CONFIG_X86_32_SMP && !CONFIG_X86_64_SMP */

#define cpu_physical_id(cpu)		boot_cpu_physical_apicid

#define safe_smp_processor_id()		0

#define stack_smp_processor_id() 	0

#endif



#ifdef CONFIG_X86_32

include/asm-x86/smp_32.h

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

extern void zap_low_mappings(void);



#ifdef CONFIG_SMP

/*

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

 * from the initial startup. We map APIC_BASE very early in page_setup(),

 * so this is correct in the x86 case.

 */

DECLARE_PER_CPU(int, cpu_number);

#define raw_smp_processor_id() (x86_read_percpu(cpu_number))



extern int safe_smp_processor_id(void);



/* We don't mark CPUs online until __cpu_up(), so we need another measure */

static inline int num_booting_cpus(void)

{

	return cpus_weight(cpu_callout_map);

}



#else /* CONFIG_SMP */

#define safe_smp_processor_id()		0

#endif /* !CONFIG_SMP */



#endif /* !ASSEMBLY */

#endif

include/asm-x86/smp_64.h

+0 −27
Original line number Diff line number Diff line
@@ -7,32 +7,5 @@ extern cpumask_t cpu_callin_map; 
extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),

				  void *info, int wait);



#ifdef CONFIG_SMP



#define raw_smp_processor_id()	read_pda(cpunumber)



#define stack_smp_processor_id()					\

({									\

	struct thread_info *ti;						\

	asm("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK));	\

	ti->cpu;							\

})



/*

 * On x86 all CPUs are mapped 1:1 to the APIC space. This simplifies

 * scheduling and IPI sending and compresses data structures.

 */

static inline int num_booting_cpus(void)

{

	return cpus_weight(cpu_callout_map);

}



#define safe_smp_processor_id()		smp_processor_id()

#else /* CONFIG_SMP */

#define stack_smp_processor_id() 0

#define safe_smp_processor_id() 0

#endif /* !CONFIG_SMP */





#endif