x86, apic: clean up ->apicid_to_node()

- 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 d0749569cdf7..2f4121499e5f 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -80,7 +80,7 @@ struct genapic apic_bigsmp = {
         .ioapic_phys_id_map             = bigsmp_ioapic_phys_id_map,
         .setup_apic_routing             = bigsmp_setup_apic_routing,
         .multi_timer_check              = NULL,
-        .apicid_to_node                 = apicid_to_node,
+        .apicid_to_node                 = bigsmp_apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 6a21aa7c0c6d..d391c2dc819d 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -61,7 +61,7 @@ struct genapic apic_default = {
         .ioapic_phys_id_map             = default_ioapic_phys_id_map,
         .setup_apic_routing             = default_setup_apic_routing,
         .multi_timer_check              = NULL,
-        .apicid_to_node                 = apicid_to_node,
+        .apicid_to_node                 = default_apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 0be59a51df2f..933f2a385990 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -122,7 +122,7 @@ struct genapic apic_es7000 = {
         .ioapic_phys_id_map             = es7000_ioapic_phys_id_map,
         .setup_apic_routing             = es7000_setup_apic_routing,
         .multi_timer_check              = NULL,
-        .apicid_to_node                 = apicid_to_node,
+        .apicid_to_node                 = es7000_apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index da4ed653506a..38344fb99793 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -67,7 +67,7 @@ struct genapic apic_numaq = {
         .ioapic_phys_id_map             = numaq_ioapic_phys_id_map,
         .setup_apic_routing             = numaq_setup_apic_routing,
         .multi_timer_check              = numaq_multi_timer_check,
-        .apicid_to_node                 = apicid_to_node,
+        .apicid_to_node                 = numaq_apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index b618a186f1e2..6150604deaa3 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -60,7 +60,7 @@ struct genapic apic_summit = {
         .ioapic_phys_id_map             = summit_ioapic_phys_id_map,
         .setup_apic_routing             = summit_setup_apic_routing,
         .multi_timer_check              = NULL,
-        .apicid_to_node                 = apicid_to_node,
+        .apicid_to_node                 = summit_apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
         .cpu_present_to_apicid          = cpu_present_to_apicid,
         .apicid_to_cpu_present          = apicid_to_cpu_present,