aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 00:50:47 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-28 17:20:22 -0500
commit72ce016583916fb7ffcbaa6a3e1f8f731b79a865 (patch)
treecd05f735f6b47278ecacebca6394dccf649c9f7e /arch/x86
parentd190cb87c4503014353f2310c4bfa2268fa7111d (diff)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/bigsmp/apic.h2
-rw-r--r--arch/x86/include/asm/es7000/apic.h2
-rw-r--r--arch/x86/include/asm/genapic.h2
-rw-r--r--arch/x86/include/asm/mach-default/mach_apic.h4
-rw-r--r--arch/x86/include/asm/mach-generic/mach_apic.h1
-rw-r--r--arch/x86/include/asm/numaq/apic.h2
-rw-r--r--arch/x86/include/asm/summit/apic.h2
-rw-r--r--arch/x86/kernel/acpi/boot.c5
-rw-r--r--arch/x86/kernel/apic.c2
-rw-r--r--arch/x86/kernel/genapic_64.c2
-rw-r--r--arch/x86/kernel/mpparse.c6
-rw-r--r--arch/x86/kernel/smpboot.c2
-rw-r--r--arch/x86/mach-generic/bigsmp.c2
-rw-r--r--arch/x86/mach-generic/default.c2
-rw-r--r--arch/x86/mach-generic/es7000.c2
-rw-r--r--arch/x86/mach-generic/numaq.c2
-rw-r--r--arch/x86/mach-generic/summit.c2
17 files changed, 20 insertions, 22 deletions
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h
index 05116d5487d2..321ea47b5dd1 100644
--- a/arch/x86/include/asm/bigsmp/apic.h
+++ b/arch/x86/include/asm/bigsmp/apic.h
@@ -56,7 +56,7 @@ static inline void bigsmp_init_apic_ldr(void)
56 apic_write(APIC_LDR, val); 56 apic_write(APIC_LDR, val);
57} 57}
58 58
59static inline void setup_apic_routing(void) 59static inline void bigsmp_setup_apic_routing(void)
60{ 60{
61 printk("Enabling APIC mode: %s. Using %d I/O APICs\n", 61 printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
62 "Physflat", nr_ioapics); 62 "Physflat", nr_ioapics);
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index db3e652f0f7d..f1183000a940 100644
--- a/arch/x86/include/asm/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
@@ -73,7 +73,7 @@ static inline void es7000_init_apic_ldr(void)
73} 73}
74 74
75extern int apic_version [MAX_APICS]; 75extern int apic_version [MAX_APICS];
76static inline void setup_apic_routing(void) 76static inline void es7000_setup_apic_routing(void)
77{ 77{
78 int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); 78 int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id());
79 printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", 79 printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index 661898c2229c..38b1202316f5 100644
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -107,7 +107,7 @@ extern void apic_send_IPI_self(int vector);
107extern struct genapic apic_x2apic_uv_x; 107extern struct genapic apic_x2apic_uv_x;
108DECLARE_PER_CPU(int, x2apic_extra_bits); 108DECLARE_PER_CPU(int, x2apic_extra_bits);
109 109
110extern void setup_apic_routing(void); 110extern void default_setup_apic_routing(void);
111#endif 111#endif
112 112
113#endif /* _ASM_X86_GENAPIC_64_H */ 113#endif /* _ASM_X86_GENAPIC_64_H */
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
index 7abdaae06f24..d44677463046 100644
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ b/arch/x86/include/asm/mach-default/mach_apic.h
@@ -25,7 +25,7 @@ static inline const struct cpumask *default_target_cpus(void)
25#define read_apic_id() (GET_APIC_ID(apic_read(APIC_ID))) 25#define read_apic_id() (GET_APIC_ID(apic_read(APIC_ID)))
26#define send_IPI_self (apic->send_IPI_self) 26#define send_IPI_self (apic->send_IPI_self)
27#define wakeup_secondary_cpu (apic->wakeup_cpu) 27#define wakeup_secondary_cpu (apic->wakeup_cpu)
28extern void setup_apic_routing(void); 28extern void default_setup_apic_routing(void);
29#else 29#else
30#define wakeup_secondary_cpu wakeup_secondary_cpu_via_init 30#define wakeup_secondary_cpu wakeup_secondary_cpu_via_init
31/* 31/*
@@ -70,7 +70,7 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
70 return cpuid_apic >> index_msb; 70 return cpuid_apic >> index_msb;
71} 71}
72 72
73static inline void setup_apic_routing(void) 73static inline void default_setup_apic_routing(void)
74{ 74{
75#ifdef CONFIG_X86_IO_APIC 75#ifdef CONFIG_X86_IO_APIC
76 printk("Enabling APIC mode: %s. Using %d I/O APICs\n", 76 printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h
index c1c96e6bb185..ddf369248ab7 100644
--- a/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -3,7 +3,6 @@
3 3
4#include <asm/genapic.h> 4#include <asm/genapic.h>
5 5
6#define setup_apic_routing (apic->setup_apic_routing)
7#define multi_timer_check (apic->multi_timer_check) 6#define multi_timer_check (apic->multi_timer_check)
8#define apicid_to_node (apic->apicid_to_node) 7#define apicid_to_node (apic->apicid_to_node)
9#define cpu_to_logical_apicid (apic->cpu_to_logical_apicid) 8#define cpu_to_logical_apicid (apic->cpu_to_logical_apicid)
diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
index dc7499b92629..2feb7e72e9ea 100644
--- a/arch/x86/include/asm/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
@@ -33,7 +33,7 @@ static inline void numaq_init_apic_ldr(void)
33 /* Already done in NUMA-Q firmware */ 33 /* Already done in NUMA-Q firmware */
34} 34}
35 35
36static inline void setup_apic_routing(void) 36static inline void numaq_setup_apic_routing(void)
37{ 37{
38 printk("Enabling APIC mode: %s. Using %d I/O APICs\n", 38 printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
39 "NUMA-Q", nr_ioapics); 39 "NUMA-Q", nr_ioapics);
diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h
index 4dafb58f9307..7ec2696bc9a0 100644
--- a/arch/x86/include/asm/summit/apic.h
+++ b/arch/x86/include/asm/summit/apic.h
@@ -74,7 +74,7 @@ static inline int summit_apic_id_registered(void)
74 return 1; 74 return 1;
75} 75}
76 76
77static inline void setup_apic_routing(void) 77static inline void summit_setup_apic_routing(void)
78{ 78{
79 printk("Enabling APIC mode: Summit. Using %d I/O APICs\n", 79 printk("Enabling APIC mode: Summit. Using %d I/O APICs\n",
80 nr_ioapics); 80 nr_ioapics);
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 314fe0dddef4..539163161a4c 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1360,9 +1360,8 @@ static void __init acpi_process_madt(void)
1360 acpi_ioapic = 1; 1360 acpi_ioapic = 1;
1361 1361
1362 smp_found_config = 1; 1362 smp_found_config = 1;
1363#ifdef CONFIG_X86_32 1363 if (apic->setup_apic_routing)
1364 setup_apic_routing(); 1364 apic->setup_apic_routing();
1365#endif
1366 } 1365 }
1367 } 1366 }
1368 if (error == -EINVAL) { 1367 if (error == -EINVAL) {
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index b7077936ac09..fcbcc03cd4bd 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1625,7 +1625,7 @@ int __init APIC_init_uniprocessor(void)
1625 enable_IR_x2apic(); 1625 enable_IR_x2apic();
1626#endif 1626#endif
1627#ifdef CONFIG_X86_64 1627#ifdef CONFIG_X86_64
1628 setup_apic_routing(); 1628 default_setup_apic_routing();
1629#endif 1629#endif
1630 1630
1631 verify_local_APIC(); 1631 verify_local_APIC();
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 060945b8eec4..d57d2138f078 100644
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -44,7 +44,7 @@ static struct genapic *apic_probe[] __initdata = {
44/* 44/*
45 * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. 45 * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
46 */ 46 */
47void __init setup_apic_routing(void) 47void __init default_setup_apic_routing(void)
48{ 48{
49 if (apic == &apic_x2apic_phys || apic == &apic_x2apic_cluster) { 49 if (apic == &apic_x2apic_phys || apic == &apic_x2apic_cluster) {
50 if (!intr_remapping_enabled) 50 if (!intr_remapping_enabled)
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index fa6bb263892e..c8a534a16d98 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -390,9 +390,9 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
390 generic_bigsmp_probe(); 390 generic_bigsmp_probe();
391#endif 391#endif
392 392
393#ifdef CONFIG_X86_32 393 if (apic->setup_apic_routing)
394 setup_apic_routing(); 394 apic->setup_apic_routing();
395#endif 395
396 if (!num_processors) 396 if (!num_processors)
397 printk(KERN_ERR "MPTABLE: no processors registered!\n"); 397 printk(KERN_ERR "MPTABLE: no processors registered!\n");
398 return num_processors; 398 return num_processors;
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 45c096f605fe..3791b4ae567f 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1128,7 +1128,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
1128 1128
1129#ifdef CONFIG_X86_64 1129#ifdef CONFIG_X86_64
1130 enable_IR_x2apic(); 1130 enable_IR_x2apic();
1131 setup_apic_routing(); 1131 default_setup_apic_routing();
1132#endif 1132#endif
1133 1133
1134 if (smp_sanity_check(max_cpus) < 0) { 1134 if (smp_sanity_check(max_cpus) < 0) {
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index f2a3418d0cc9..ad3837a59bd4 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -78,7 +78,7 @@ struct genapic apic_bigsmp = {
78 .init_apic_ldr = bigsmp_init_apic_ldr, 78 .init_apic_ldr = bigsmp_init_apic_ldr,
79 79
80 .ioapic_phys_id_map = bigsmp_ioapic_phys_id_map, 80 .ioapic_phys_id_map = bigsmp_ioapic_phys_id_map,
81 .setup_apic_routing = setup_apic_routing, 81 .setup_apic_routing = bigsmp_setup_apic_routing,
82 .multi_timer_check = multi_timer_check, 82 .multi_timer_check = multi_timer_check,
83 .apicid_to_node = apicid_to_node, 83 .apicid_to_node = apicid_to_node,
84 .cpu_to_logical_apicid = cpu_to_logical_apicid, 84 .cpu_to_logical_apicid = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index c403f3d9300c..67f287fc12df 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -59,7 +59,7 @@ struct genapic apic_default = {
59 .init_apic_ldr = default_init_apic_ldr, 59 .init_apic_ldr = default_init_apic_ldr,
60 60
61 .ioapic_phys_id_map = default_ioapic_phys_id_map, 61 .ioapic_phys_id_map = default_ioapic_phys_id_map,
62 .setup_apic_routing = setup_apic_routing, 62 .setup_apic_routing = default_setup_apic_routing,
63 .multi_timer_check = multi_timer_check, 63 .multi_timer_check = multi_timer_check,
64 .apicid_to_node = apicid_to_node, 64 .apicid_to_node = apicid_to_node,
65 .cpu_to_logical_apicid = cpu_to_logical_apicid, 65 .cpu_to_logical_apicid = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index ce09baf08724..f61172939461 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -120,7 +120,7 @@ struct genapic apic_es7000 = {
120 .init_apic_ldr = es7000_init_apic_ldr, 120 .init_apic_ldr = es7000_init_apic_ldr,
121 121
122 .ioapic_phys_id_map = es7000_ioapic_phys_id_map, 122 .ioapic_phys_id_map = es7000_ioapic_phys_id_map,
123 .setup_apic_routing = setup_apic_routing, 123 .setup_apic_routing = es7000_setup_apic_routing,
124 .multi_timer_check = multi_timer_check, 124 .multi_timer_check = multi_timer_check,
125 .apicid_to_node = apicid_to_node, 125 .apicid_to_node = apicid_to_node,
126 .cpu_to_logical_apicid = cpu_to_logical_apicid, 126 .cpu_to_logical_apicid = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 5d98f18a0bde..8c137f413485 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -65,7 +65,7 @@ struct genapic apic_numaq = {
65 .init_apic_ldr = numaq_init_apic_ldr, 65 .init_apic_ldr = numaq_init_apic_ldr,
66 66
67 .ioapic_phys_id_map = numaq_ioapic_phys_id_map, 67 .ioapic_phys_id_map = numaq_ioapic_phys_id_map,
68 .setup_apic_routing = setup_apic_routing, 68 .setup_apic_routing = numaq_setup_apic_routing,
69 .multi_timer_check = multi_timer_check, 69 .multi_timer_check = multi_timer_check,
70 .apicid_to_node = apicid_to_node, 70 .apicid_to_node = apicid_to_node,
71 .cpu_to_logical_apicid = cpu_to_logical_apicid, 71 .cpu_to_logical_apicid = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 6abdd53a01c5..0698566dc7b4 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -58,7 +58,7 @@ struct genapic apic_summit = {
58 .init_apic_ldr = summit_init_apic_ldr, 58 .init_apic_ldr = summit_init_apic_ldr,
59 59
60 .ioapic_phys_id_map = summit_ioapic_phys_id_map, 60 .ioapic_phys_id_map = summit_ioapic_phys_id_map,
61 .setup_apic_routing = setup_apic_routing, 61 .setup_apic_routing = summit_setup_apic_routing,
62 .multi_timer_check = multi_timer_check, 62 .multi_timer_check = multi_timer_check,
63 .apicid_to_node = apicid_to_node, 63 .apicid_to_node = apicid_to_node,
64 .cpu_to_logical_apicid = cpu_to_logical_apicid, 64 .cpu_to_logical_apicid = cpu_to_logical_apicid,