x86, apic: clean up ->cpu_present_to_apicid()

- separate the namespace

 - remove macros

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

5 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index cd6f02ba88ea..1eaf18c801d8 100644
--- 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 ef9b936c41ab..2903657f4209 100644
--- 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 74bf2b6b7519..5a3a8ab4f8a0 100644
--- 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 461f5beedb28..d928cae211cc 100644
--- 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 d99be2d4efc7..e6bb34ee580b 100644
--- 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,