redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

x86, apic: clean up ->setup_apic_routing() 

- separate the namespace

 - remove macros

 - remove namespace clash on 64-bit

Signed-off-by: Ingo Molnar <mingo@elte.hu>
hifive-unleashed-5.1
Ingo Molnar 2009-01-28 06:50:47 +01:00
parent d190cb87c4
commit 72ce016583
17 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/bigsmp/apic.h
View File

@ -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);

2
arch/x86/include/asm/es7000/apic.h
View File

@ -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",

2
arch/x86/include/asm/genapic.h
View File

@ -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 */

4
arch/x86/include/asm/mach-default/mach_apic.h
View File

@ -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",

1
arch/x86/include/asm/mach-generic/mach_apic.h
View File

@ -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)

2
arch/x86/include/asm/numaq/apic.h
View File

@ -33,7 +33,7 @@ static inline void numaq_init_apic_ldr(void)
/* Already done in NUMA-Q firmware */
}
static inline void setup_apic_routing(void)
static inline void numaq_setup_apic_routing(void)
{
printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
"NUMA-Q", nr_ioapics);

2
arch/x86/include/asm/summit/apic.h
View File

@ -74,7 +74,7 @@ static inline int summit_apic_id_registered(void)
return 1;
}
static inline void setup_apic_routing(void)
static inline void summit_setup_apic_routing(void)
{
printk("Enabling APIC mode: Summit. Using %d I/O APICs\n",
nr_ioapics);

5
arch/x86/kernel/acpi/boot.c
View File

@ -1360,9 +1360,8 @@ static void __init acpi_process_madt(void)
acpi_ioapic = 1;
smp_found_config = 1;
#ifdef CONFIG_X86_32
setup_apic_routing();
#endif
if (apic->setup_apic_routing)
apic->setup_apic_routing();
}
}
if (error == -EINVAL) {

2
arch/x86/kernel/apic.c
View File

@ -1625,7 +1625,7 @@ int __init APIC_init_uniprocessor(void)
enable_IR_x2apic();
#endif
#ifdef CONFIG_X86_64
setup_apic_routing();
default_setup_apic_routing();
#endif
verify_local_APIC();

2
arch/x86/kernel/genapic_64.c
View File

@ -44,7 +44,7 @@ static struct genapic *apic_probe[] __initdata = {
/*
* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
*/
void __init setup_apic_routing(void)
void __init default_setup_apic_routing(void)
{
if (apic == &apic_x2apic_phys || apic == &apic_x2apic_cluster) {
if (!intr_remapping_enabled)

6
arch/x86/kernel/mpparse.c
View File

@ -390,9 +390,9 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
generic_bigsmp_probe();
#endif
#ifdef CONFIG_X86_32
setup_apic_routing();
#endif
if (apic->setup_apic_routing)
apic->setup_apic_routing();
if (!num_processors)
printk(KERN_ERR "MPTABLE: no processors registered!\n");
return num_processors;

2
arch/x86/kernel/smpboot.c
View File

@ -1128,7 +1128,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
#ifdef CONFIG_X86_64
enable_IR_x2apic();
setup_apic_routing();
default_setup_apic_routing();
#endif
if (smp_sanity_check(max_cpus) < 0) {

2
arch/x86/mach-generic/bigsmp.c
View File

@ -78,7 +78,7 @@ struct genapic apic_bigsmp = {
.init_apic_ldr = bigsmp_init_apic_ldr,
.ioapic_phys_id_map = bigsmp_ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
.setup_apic_routing = bigsmp_setup_apic_routing,
.multi_timer_check = multi_timer_check,
.apicid_to_node = apicid_to_node,
.cpu_to_logical_apicid = cpu_to_logical_apicid,

2
arch/x86/mach-generic/default.c
View File

@ -59,7 +59,7 @@ struct genapic apic_default = {
.init_apic_ldr = default_init_apic_ldr,
.ioapic_phys_id_map = default_ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
.setup_apic_routing = default_setup_apic_routing,
.multi_timer_check = multi_timer_check,
.apicid_to_node = apicid_to_node,
.cpu_to_logical_apicid = cpu_to_logical_apicid,

2
arch/x86/mach-generic/es7000.c
View File

@ -120,7 +120,7 @@ struct genapic apic_es7000 = {
.init_apic_ldr = es7000_init_apic_ldr,
.ioapic_phys_id_map = es7000_ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
.setup_apic_routing = es7000_setup_apic_routing,
.multi_timer_check = multi_timer_check,
.apicid_to_node = apicid_to_node,
.cpu_to_logical_apicid = cpu_to_logical_apicid,

2
arch/x86/mach-generic/numaq.c
View File

@ -65,7 +65,7 @@ struct genapic apic_numaq = {
.init_apic_ldr = numaq_init_apic_ldr,
.ioapic_phys_id_map = numaq_ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
.setup_apic_routing = numaq_setup_apic_routing,
.multi_timer_check = multi_timer_check,
.apicid_to_node = apicid_to_node,
.cpu_to_logical_apicid = cpu_to_logical_apicid,

2
arch/x86/mach-generic/summit.c
View File

@ -58,7 +58,7 @@ struct genapic apic_summit = {
.init_apic_ldr = summit_init_apic_ldr,
.ioapic_phys_id_map = summit_ioapic_phys_id_map,
.setup_apic_routing = setup_apic_routing,
.setup_apic_routing = summit_setup_apic_routing,
.multi_timer_check = multi_timer_check,
.apicid_to_node = apicid_to_node,
.cpu_to_logical_apicid = cpu_to_logical_apicid,