Commit a5c43296 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: clean up ->init_apic_ldr() 



- separate the namespace

 - remove macros

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e2d40b18

arch/x86/include/asm/bigsmp/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline unsigned long calculate_ldr(int cpu) 
 * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel

 * document number 292116).  So here it goes...

 */

static inline void init_apic_ldr(void)

static inline void bigsmp_init_apic_ldr(void)

{

	unsigned long val;

	int cpu = smp_processor_id();

arch/x86/include/asm/es7000/apic.h

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline unsigned long calculate_ldr(int cpu) 
 * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel

 * document number 292116).  So here it goes...

 */

static inline void init_apic_ldr_cluster(void)

static inline void es7000_init_apic_ldr_cluster(void)

{

	unsigned long val;

	int cpu = smp_processor_id();
@@ -62,7 +62,7 @@ static inline void init_apic_ldr_cluster(void) 
	apic_write(APIC_LDR, val);

}



static inline void init_apic_ldr(void)

static inline void es7000_init_apic_ldr(void)

{

	unsigned long val;

	int cpu = smp_processor_id();

arch/x86/include/asm/mach-default/mach_apic.h

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ static inline const struct cpumask *default_target_cpus(void) 


#ifdef CONFIG_X86_64

#include <asm/genapic.h>

#define init_apic_ldr (apic->init_apic_ldr)

#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)

#define phys_pkg_id	(apic->phys_pkg_id)
@@ -36,7 +35,7 @@ extern void setup_apic_routing(void); 
 * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel

 * document number 292116).  So here it goes...

 */

static inline void init_apic_ldr(void)

static inline void default_init_apic_ldr(void)

{

	unsigned long val;

arch/x86/include/asm/mach-generic/mach_apic.h

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <asm/genapic.h>



#define init_apic_ldr (apic->init_apic_ldr)

#define ioapic_phys_id_map (apic->ioapic_phys_id_map)

#define setup_apic_routing (apic->setup_apic_routing)

#define multi_timer_check (apic->multi_timer_check)

arch/x86/include/asm/numaq/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static inline int numaq_apic_id_registered(void) 
	return 1;

}



static inline void init_apic_ldr(void)

static inline void numaq_init_apic_ldr(void)

{

	/* Already done in NUMA-Q firmware */

}