Commit 0f08c3b2 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner
Browse files

x86/smp: Reduce code duplication 



The CONFIG_X86_32_SMP and CONFIG_X86_64_SMP sections in smp.h contain
duplicate defines.

Merge them and only put the difference into an #ifdeff'ed section.

[ tglx: Massaged changelog ]

Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Cc: jaswinder@infradead.org
Link: http://lkml.kernel.org/r/1491734806-15413-1-git-send-email-douly.fnst@cn.fujitsu.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 352ef03c

arch/x86/include/asm/smp.h

+13 −16
Original line number Diff line number Diff line
@@ -149,6 +149,19 @@ void smp_store_cpu_info(int id); 
#define cpu_physical_id(cpu)	per_cpu(x86_cpu_to_apicid, cpu)

#define cpu_acpi_id(cpu)	per_cpu(x86_cpu_to_acpiid, cpu)



/*

 * 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.

 */

#define raw_smp_processor_id() (this_cpu_read(cpu_number))



#ifdef CONFIG_X86_32

extern int safe_smp_processor_id(void);

#else

# define safe_smp_processor_id()	smp_processor_id()

#endif



#else /* !CONFIG_SMP */

#define wbinvd_on_cpu(cpu)     wbinvd()

static inline int wbinvd_on_all_cpus(void)
@@ -161,22 +174,6 @@ static inline int wbinvd_on_all_cpus(void) 


extern unsigned disabled_cpus;



#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.

 */

#define raw_smp_processor_id() (this_cpu_read(cpu_number))

extern int safe_smp_processor_id(void);



#elif defined(CONFIG_X86_64_SMP)

#define raw_smp_processor_id() (this_cpu_read(cpu_number))



#define safe_smp_processor_id()		smp_processor_id()



#endif



#ifdef CONFIG_X86_LOCAL_APIC



#ifndef CONFIG_X86_64

CRA Git | Maintained and supported by SUSTech CRA and CCSE