x86, apic: clean up ->cpu_to_logical_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 2f4121499e5f..cd6f02ba88ea 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -81,7 +81,7 @@ struct genapic apic_bigsmp = {
         .setup_apic_routing             = bigsmp_setup_apic_routing,
         .multi_timer_check              = NULL,
         .apicid_to_node                 = bigsmp_apicid_to_node,
-        .cpu_to_logical_apicid          = cpu_to_logical_apicid,
+        .cpu_to_logical_apicid          = bigsmp_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index d391c2dc819d..ef9b936c41ab 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -62,7 +62,7 @@ struct genapic apic_default = {
         .setup_apic_routing             = default_setup_apic_routing,
         .multi_timer_check              = NULL,
         .apicid_to_node                 = default_apicid_to_node,
-        .cpu_to_logical_apicid          = cpu_to_logical_apicid,
+        .cpu_to_logical_apicid          = default_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 933f2a385990..74bf2b6b7519 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -123,7 +123,7 @@ struct genapic apic_es7000 = {
         .setup_apic_routing             = es7000_setup_apic_routing,
         .multi_timer_check              = NULL,
         .apicid_to_node                 = es7000_apicid_to_node,
-        .cpu_to_logical_apicid          = cpu_to_logical_apicid,
+        .cpu_to_logical_apicid          = es7000_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 38344fb99793..461f5beedb28 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -68,7 +68,7 @@ struct genapic apic_numaq = {
         .setup_apic_routing             = numaq_setup_apic_routing,
         .multi_timer_check              = numaq_multi_timer_check,
         .apicid_to_node                 = numaq_apicid_to_node,
-        .cpu_to_logical_apicid          = cpu_to_logical_apicid,
+        .cpu_to_logical_apicid          = numaq_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 6150604deaa3..d99be2d4efc7 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -61,7 +61,7 @@ struct genapic apic_summit = {
         .setup_apic_routing             = summit_setup_apic_routing,
         .multi_timer_check              = NULL,
         .apicid_to_node                 = summit_apicid_to_node,
-        .cpu_to_logical_apicid          = cpu_to_logical_apicid,
+        .cpu_to_logical_apicid          = summit_cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
         .setup_portio_remap             = setup_portio_remap,