x86, apic: clean up ->apicid_to_cpu_present()

- 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 1eaf18c801d..61396523074 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -83,7 +83,7 @@ struct genapic apic_bigsmp = {
         .apicid_to_node                 = bigsmp_apicid_to_node,
         .cpu_to_logical_apicid          = bigsmp_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = bigsmp_cpu_present_to_apicid,
-        .apicid_to_cpu_present          = apicid_to_cpu_present,
+        .apicid_to_cpu_present          = bigsmp_apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
         .check_phys_apicid_present      = check_phys_apicid_present,
         .enable_apic_mode               = enable_apic_mode,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 2903657f420..8fc704a3db7 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -64,7 +64,7 @@ struct genapic apic_default = {
         .apicid_to_node                 = default_apicid_to_node,
         .cpu_to_logical_apicid          = default_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
-        .apicid_to_cpu_present          = apicid_to_cpu_present,
+        .apicid_to_cpu_present          = default_apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
         .check_phys_apicid_present      = check_phys_apicid_present,
         .enable_apic_mode               = enable_apic_mode,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 5a3a8ab4f8a..1e0e1627455 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -125,7 +125,7 @@ struct genapic apic_es7000 = {
         .apicid_to_node                 = es7000_apicid_to_node,
         .cpu_to_logical_apicid          = es7000_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = es7000_cpu_present_to_apicid,
-        .apicid_to_cpu_present          = apicid_to_cpu_present,
+        .apicid_to_cpu_present          = es7000_apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
         .check_phys_apicid_present      = check_phys_apicid_present,
         .enable_apic_mode               = enable_apic_mode,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index d928cae211c..839b86b765a 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -70,7 +70,7 @@ struct genapic apic_numaq = {
         .apicid_to_node                 = numaq_apicid_to_node,
         .cpu_to_logical_apicid          = numaq_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = numaq_cpu_present_to_apicid,
-        .apicid_to_cpu_present          = apicid_to_cpu_present,
+        .apicid_to_cpu_present          = numaq_apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
         .check_phys_apicid_present      = check_phys_apicid_present,
         .enable_apic_mode               = enable_apic_mode,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index e6bb34ee580..b6e37607a52 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -63,7 +63,7 @@ struct genapic apic_summit = {
         .apicid_to_node                 = summit_apicid_to_node,
         .cpu_to_logical_apicid          = summit_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = summit_cpu_present_to_apicid,
-        .apicid_to_cpu_present          = apicid_to_cpu_present,
+        .apicid_to_cpu_present          = summit_apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
         .check_phys_apicid_present      = check_phys_apicid_present,
         .enable_apic_mode               = enable_apic_mode,