x86, apic: clean up ->cpu_present_to_apicid()

- separate the namespace

 - remove macros

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h
index d0d894ff7d3ef8c3394092a1863d18be7269f730..eea5e9788dddb98dde810b7d6945771d6d78a5b1 100644 (file)
--- a/arch/x86/include/asm/bigsmp/apic.h
+++ b/arch/x86/include/asm/bigsmp/apic.h
@@ -67,7 +67,7 @@ static inline int bigsmp_apicid_to_node(int logical_apicid)
        return apicid_2_node[hard_smp_processor_id()];
 }
 
-static inline int cpu_present_to_apicid(int mps_cpu)
+static inline int bigsmp_cpu_present_to_apicid(int mps_cpu)
 {
        if (mps_cpu < nr_cpu_ids)
                return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu);

diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index e0cd07e74f9844025c35e6db8e1d148085f6655b..7cdde3d9c5f6aac21dd4fd91ed16d202bbdf7d81 100644 (file)
--- a/arch/x86/include/asm/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
@@ -88,7 +88,7 @@ static inline int es7000_apicid_to_node(int logical_apicid)
 }
 
 
-static inline int cpu_present_to_apicid(int mps_cpu)
+static inline int es7000_cpu_present_to_apicid(int mps_cpu)
 {
        if (!mps_cpu)
                return boot_cpu_physical_apicid;

diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index 38b1202316f5dff3366ccf1aac7fa454de269db2..2cb14d51e459057c6199dc82ba9cf5ac984d4de5 100644 (file)
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -108,6 +108,8 @@ extern struct genapic apic_x2apic_uv_x;
 DECLARE_PER_CPU(int, x2apic_extra_bits);
 
 extern void default_setup_apic_routing(void);
+
+extern int default_cpu_present_to_apicid(int mps_cpu);
 #endif
 
 #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 eae3e4b6ed04aea33ca05460f74b58cd2fa64fc4..15d5627a9d6ffdce9fdfd46570a5f8843dd5854f 100644 (file)
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ b/arch/x86/include/asm/mach-default/mach_apic.h
@@ -110,7 +110,7 @@ static inline int default_cpu_to_logical_apicid(int cpu)
        return 1 << cpu;
 }
 
-static inline int cpu_present_to_apicid(int mps_cpu)
+static inline int __default_cpu_present_to_apicid(int mps_cpu)
 {
        if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))
                return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);
@@ -118,6 +118,15 @@ static inline int cpu_present_to_apicid(int mps_cpu)
                return BAD_APICID;
 }
 
+#ifdef CONFIG_X86_32
+static inline int default_cpu_present_to_apicid(int mps_cpu)
+{
+       return __default_cpu_present_to_apicid(mps_cpu);
+}
+#else
+extern int default_cpu_present_to_apicid(int mps_cpu);
+#endif
+
 static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)
 {
        return physid_mask_of_physid(phys_apicid);

diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h
index 2ea913e8e0d0a24d9557ca263db8f53c2f7c83be..332fe93ab41ac0205c20885a53253b9a460052c1 100644 (file)
--- a/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -3,7 +3,6 @@
 
 #include <asm/genapic.h>
 
-#define cpu_present_to_apicid (apic->cpu_present_to_apicid)
 #define apicid_to_cpu_present (apic->apicid_to_cpu_present)
 #define setup_portio_remap (apic->setup_portio_remap)
 #define check_phys_apicid_present (apic->check_phys_apicid_present)

diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
index 6989abd34853b396e1c9c542a48a8043ecb0453c..f482b0634476145b6b573020843072fe44207761 100644 (file)
--- a/arch/x86/include/asm/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
@@ -69,7 +69,7 @@ static inline int numaq_cpu_to_logical_apicid(int cpu)
  * cpu to APIC ID relation to properly interact with the intelligent
  * mode of the cluster controller.
  */
-static inline int cpu_present_to_apicid(int mps_cpu)
+static inline int numaq_cpu_present_to_apicid(int mps_cpu)
 {
        if (mps_cpu < 60)
                return ((mps_cpu >> 2) << 4) | (1 << (mps_cpu & 0x3));

diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h
index d564d7ee3f6cf6f4a14c9afb8219eed0e1451105..fc127369188049e0a1ca51a976161b33b328e2a1 100644 (file)
--- a/arch/x86/include/asm/summit/apic.h
+++ b/arch/x86/include/asm/summit/apic.h
@@ -96,7 +96,7 @@ static inline int summit_cpu_to_logical_apicid(int cpu)
 #endif
 }
 
-static inline int cpu_present_to_apicid(int mps_cpu)
+static inline int summit_cpu_present_to_apicid(int mps_cpu)
 {
        if (mps_cpu < nr_cpu_ids)
                return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);

diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c
index 9446f372a16b5741f60dfcb3661e36ed7c1385e7..f4a2c1c0a1a4c5ec6dc73a3da23da75d0e7a1b6c 100644 (file)
--- a/arch/x86/kernel/genapic_flat_64.c
+++ b/arch/x86/kernel/genapic_flat_64.c
@@ -197,7 +197,7 @@ struct genapic apic_flat =  {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = NULL,
        .cpu_to_logical_apicid          = NULL,
-       .cpu_present_to_apicid          = NULL,
+       .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .apicid_to_cpu_present          = NULL,
        .setup_portio_remap             = NULL,
        .check_phys_apicid_present      = NULL,
@@ -341,7 +341,7 @@ struct genapic apic_physflat =  {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = NULL,
        .cpu_to_logical_apicid          = NULL,
-       .cpu_present_to_apicid          = NULL,
+       .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .apicid_to_cpu_present          = NULL,
        .setup_portio_remap             = NULL,
        .check_phys_apicid_present      = NULL,

diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c
index 2eeca6e744af3d5d3e05e15a48937c51eb83b816..710d612a9641b61fac96cd86fb7b3e75424b66ad 100644 (file)
--- a/arch/x86/kernel/genx2apic_cluster.c
+++ b/arch/x86/kernel/genx2apic_cluster.c
@@ -199,7 +199,7 @@ struct genapic apic_x2apic_cluster = {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = NULL,
        .cpu_to_logical_apicid          = NULL,
-       .cpu_present_to_apicid          = NULL,
+       .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .apicid_to_cpu_present          = NULL,
        .setup_portio_remap             = NULL,
        .check_phys_apicid_present      = NULL,

diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c
index be0ee3e56ef1ea13cc5e766e96a8953f50e12081..49a449178c3be2328283211d81b299b32c1cb0f3 100644 (file)
--- a/arch/x86/kernel/genx2apic_phys.c
+++ b/arch/x86/kernel/genx2apic_phys.c
@@ -195,7 +195,7 @@ struct genapic apic_x2apic_phys = {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = NULL,
        .cpu_to_logical_apicid          = NULL,
-       .cpu_present_to_apicid          = NULL,
+       .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .apicid_to_cpu_present          = NULL,
        .setup_portio_remap             = NULL,
        .check_phys_apicid_present      = NULL,

diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index 68b423f3da992c004d0682350ca1abe94dc22ad9..a08a63591864335f0b7a561a159b0a2ab2fe39f0 100644 (file)
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@ -260,7 +260,7 @@ struct genapic apic_x2apic_uv_x = {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = NULL,
        .cpu_to_logical_apicid          = NULL,
-       .cpu_present_to_apicid          = NULL,
+       .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .apicid_to_cpu_present          = NULL,
        .setup_portio_remap             = NULL,
        .check_phys_apicid_present      = NULL,

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 1dd4cecd4bc062334fe42d0a7f3371911aa218a0..812bf39de35522d048d8c43a2ed2e91b3f428a2c 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -903,9 +903,16 @@ do_rest:
        return boot_error;
 }
 
+#ifdef CONFIG_X86_64
+int default_cpu_present_to_apicid(int mps_cpu)
+{
+       return __default_cpu_present_to_apicid(mps_cpu);
+}
+#endif
+
 int __cpuinit native_cpu_up(unsigned int cpu)
 {
-       int apicid = cpu_present_to_apicid(cpu);
+       int apicid = apic->cpu_present_to_apicid(cpu);
        unsigned long flags;
        int err;
 

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index cd6f02ba88eaadb14c1bd71c0a324fa929d5080d..1eaf18c801d865e9a0744e75a12116a1597ffc75 100644 (file)
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -82,7 +82,7 @@ struct genapic apic_bigsmp = {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = bigsmp_apicid_to_node,
        .cpu_to_logical_apicid          = bigsmp_cpu_to_logical_apicid,
-       .cpu_present_to_apicid          = cpu_present_to_apicid,
+       .cpu_present_to_apicid          = bigsmp_cpu_present_to_apicid,
        .apicid_to_cpu_present          = apicid_to_cpu_present,
        .setup_portio_remap             = setup_portio_remap,
        .check_phys_apicid_present      = check_phys_apicid_present,

diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index ef9b936c41ab1a2a638d9560f88489d67d51af37..2903657f4209c10120ad4b2bdd476c8b50e31bc6 100644 (file)
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -63,7 +63,7 @@ struct genapic apic_default = {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = default_apicid_to_node,
        .cpu_to_logical_apicid          = default_cpu_to_logical_apicid,
-       .cpu_present_to_apicid          = cpu_present_to_apicid,
+       .cpu_present_to_apicid          = default_cpu_present_to_apicid,
        .apicid_to_cpu_present          = apicid_to_cpu_present,
        .setup_portio_remap             = setup_portio_remap,
        .check_phys_apicid_present      = check_phys_apicid_present,

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 74bf2b6b751900f3c603e104bf08c48918cecb78..5a3a8ab4f8a002ce32d3ca9fd5aee5488c365a44 100644 (file)
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -124,7 +124,7 @@ struct genapic apic_es7000 = {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = es7000_apicid_to_node,
        .cpu_to_logical_apicid          = es7000_cpu_to_logical_apicid,
-       .cpu_present_to_apicid          = cpu_present_to_apicid,
+       .cpu_present_to_apicid          = es7000_cpu_present_to_apicid,
        .apicid_to_cpu_present          = apicid_to_cpu_present,
        .setup_portio_remap             = setup_portio_remap,
        .check_phys_apicid_present      = check_phys_apicid_present,

diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 461f5beedb285102fb2c17cd09dcb1587949afca..d928cae211cc9f4a1e63f98a12e1054183aa1935 100644 (file)
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -69,7 +69,7 @@ struct genapic apic_numaq = {
        .multi_timer_check              = numaq_multi_timer_check,
        .apicid_to_node                 = numaq_apicid_to_node,
        .cpu_to_logical_apicid          = numaq_cpu_to_logical_apicid,
-       .cpu_present_to_apicid          = cpu_present_to_apicid,
+       .cpu_present_to_apicid          = numaq_cpu_present_to_apicid,
        .apicid_to_cpu_present          = apicid_to_cpu_present,
        .setup_portio_remap             = setup_portio_remap,
        .check_phys_apicid_present      = check_phys_apicid_present,

diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index d99be2d4efc770851ec71bee0eccd73dfcb0d25b..e6bb34ee580b92e691723b42a8360cee5d3a65c7 100644 (file)
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -62,7 +62,7 @@ struct genapic apic_summit = {
        .multi_timer_check              = NULL,
        .apicid_to_node                 = summit_apicid_to_node,
        .cpu_to_logical_apicid          = summit_cpu_to_logical_apicid,
-       .cpu_present_to_apicid          = cpu_present_to_apicid,
+       .cpu_present_to_apicid          = summit_cpu_present_to_apicid,
        .apicid_to_cpu_present          = apicid_to_cpu_present,
        .setup_portio_remap             = setup_portio_remap,
        .check_phys_apicid_present      = check_phys_apicid_present,