x86, apic: clean up ->ioapic_phys_id_map()

- 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 7b7fc471a3f7..f2a3418d0cc9 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -77,7 +77,7 @@ struct genapic apic_bigsmp = {
         .vector_allocation_domain       = bigsmp_vector_allocation_domain,
         .init_apic_ldr                  = bigsmp_init_apic_ldr,
 
-        .ioapic_phys_id_map             = ioapic_phys_id_map,
+        .ioapic_phys_id_map             = bigsmp_ioapic_phys_id_map,
         .setup_apic_routing             = setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 633e8482af25..c403f3d9300c 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -58,7 +58,7 @@ struct genapic apic_default = {
         .vector_allocation_domain       = default_vector_allocation_domain,
         .init_apic_ldr                  = default_init_apic_ldr,
 
-        .ioapic_phys_id_map             = ioapic_phys_id_map,
+        .ioapic_phys_id_map             = default_ioapic_phys_id_map,
         .setup_apic_routing             = setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index b70833e35976..ce09baf08724 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -119,7 +119,7 @@ struct genapic apic_es7000 = {
         .vector_allocation_domain       = es7000_vector_allocation_domain,
         .init_apic_ldr                  = es7000_init_apic_ldr,
 
-        .ioapic_phys_id_map             = ioapic_phys_id_map,
+        .ioapic_phys_id_map             = es7000_ioapic_phys_id_map,
         .setup_apic_routing             = setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index a06fda579281..5d98f18a0bde 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -64,7 +64,7 @@ struct genapic apic_numaq = {
         .vector_allocation_domain       = numaq_vector_allocation_domain,
         .init_apic_ldr                  = numaq_init_apic_ldr,
 
-        .ioapic_phys_id_map             = ioapic_phys_id_map,
+        .ioapic_phys_id_map             = numaq_ioapic_phys_id_map,
         .setup_apic_routing             = setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 36c552fa4275..6abdd53a01c5 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -57,7 +57,7 @@ struct genapic apic_summit = {
         .vector_allocation_domain       = summit_vector_allocation_domain,
         .init_apic_ldr                  = summit_init_apic_ldr,
 
-        .ioapic_phys_id_map             = ioapic_phys_id_map,
+        .ioapic_phys_id_map             = summit_ioapic_phys_id_map,
         .setup_apic_routing             = setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,