Commit 72ce0165 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: clean up ->setup_apic_routing() 



- separate the namespace

 - remove macros

 - remove namespace clash on 64-bit

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

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

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static inline void bigsmp_init_apic_ldr(void) 
	apic_write(APIC_LDR, val);

}



static inline void setup_apic_routing(void)

static inline void bigsmp_setup_apic_routing(void)

{

	printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",

		"Physflat", nr_ioapics);

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

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static inline void es7000_init_apic_ldr(void) 
}



extern int apic_version [MAX_APICS];

static inline void setup_apic_routing(void)

static inline void es7000_setup_apic_routing(void)

{

	int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id());

	printk("Enabling APIC mode:  %s. Using %d I/O APICs, target cpus %lx\n",

arch/x86/include/asm/genapic.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ extern void apic_send_IPI_self(int vector); 
extern struct genapic apic_x2apic_uv_x;

DECLARE_PER_CPU(int, x2apic_extra_bits);



extern void setup_apic_routing(void);

extern void default_setup_apic_routing(void);

#endif



#endif /* _ASM_X86_GENAPIC_64_H */

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

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static inline const struct cpumask *default_target_cpus(void) 
#define read_apic_id()  (GET_APIC_ID(apic_read(APIC_ID)))

#define send_IPI_self (apic->send_IPI_self)

#define wakeup_secondary_cpu (apic->wakeup_cpu)

extern void setup_apic_routing(void);

extern void default_setup_apic_routing(void);

#else

#define wakeup_secondary_cpu wakeup_secondary_cpu_via_init

/*
@@ -70,7 +70,7 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) 
	return cpuid_apic >> index_msb;

}



static inline void setup_apic_routing(void)

static inline void default_setup_apic_routing(void)

{

#ifdef CONFIG_X86_IO_APIC

	printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",

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 setup_apic_routing (apic->setup_apic_routing)

#define multi_timer_check (apic->multi_timer_check)

#define apicid_to_node (apic->apicid_to_node)

#define cpu_to_logical_apicid (apic->cpu_to_logical_apicid)