x86, apic: clean up ->setup_apic_routing()

- separate the namespace

 - remove macros

 - remove namespace clash on 64-bit

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 f2a3418d0cc9..ad3837a59bd4 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -78,7 +78,7 @@ struct genapic apic_bigsmp = {
         .init_apic_ldr                  = bigsmp_init_apic_ldr,
 
         .ioapic_phys_id_map             = bigsmp_ioapic_phys_id_map,
-        .setup_apic_routing             = setup_apic_routing,
+        .setup_apic_routing             = bigsmp_setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index c403f3d9300c..67f287fc12df 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -59,7 +59,7 @@ struct genapic apic_default = {
         .init_apic_ldr                  = default_init_apic_ldr,
 
         .ioapic_phys_id_map             = default_ioapic_phys_id_map,
-        .setup_apic_routing             = setup_apic_routing,
+        .setup_apic_routing             = default_setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index ce09baf08724..f61172939461 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -120,7 +120,7 @@ struct genapic apic_es7000 = {
         .init_apic_ldr                  = es7000_init_apic_ldr,
 
         .ioapic_phys_id_map             = es7000_ioapic_phys_id_map,
-        .setup_apic_routing             = setup_apic_routing,
+        .setup_apic_routing             = es7000_setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 5d98f18a0bde..8c137f413485 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -65,7 +65,7 @@ struct genapic apic_numaq = {
         .init_apic_ldr                  = numaq_init_apic_ldr,
 
         .ioapic_phys_id_map             = numaq_ioapic_phys_id_map,
-        .setup_apic_routing             = setup_apic_routing,
+        .setup_apic_routing             = numaq_setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 6abdd53a01c5..0698566dc7b4 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -58,7 +58,7 @@ struct genapic apic_summit = {
         .init_apic_ldr                  = summit_init_apic_ldr,
 
         .ioapic_phys_id_map             = summit_ioapic_phys_id_map,
-        .setup_apic_routing             = setup_apic_routing,
+        .setup_apic_routing             = summit_setup_apic_routing,
         .multi_timer_check              = multi_timer_check,
         .apicid_to_node                 = apicid_to_node,
         .cpu_to_logical_apicid          = cpu_to_logical_apicid,