x86, apic: clean up target_cpus methods

Impact: cleanup

Clean up all the target_cpus() namespace overlap that exists
between bigsmp, es7000, mach-default, numaq and summit - by
separating the different functions into different names.

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 06be776067ad..d3cead2d2fc8 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -68,7 +68,7 @@ struct genapic apic_bigsmp = {
         /* phys delivery to target CPU: */
         .irq_dest_mode                  = 0,
 
-        .target_cpus                    = target_cpus,
+        .target_cpus                    = bigsmp_target_cpus,
         .ESR_DISABLE                    = esr_disable,
         .apic_destination_logical       = APIC_DEST_LOGICAL,
         .check_apicid_used              = check_apicid_used,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index fe97b0114a06..a483e22273e5 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -35,7 +35,7 @@ struct genapic apic_default = {
         /* logical delivery broadcast to all CPUs: */
         .irq_dest_mode                  = 1,
 
-        .target_cpus                    = target_cpus,
+        .target_cpus                    = default_target_cpus,
         .ESR_DISABLE                    = esr_disable,
         .apic_destination_logical       = APIC_DEST_LOGICAL,
         .check_apicid_used              = check_apicid_used,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 269a97aef431..e31f0c35470d 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -111,7 +111,7 @@ struct genapic apic_es7000 = {
         /* phys delivery to target CPUs: */
         .irq_dest_mode                  = 0,
 
-        .target_cpus                    = target_cpus,
+        .target_cpus                    = es7000_target_cpus,
         .ESR_DISABLE                    = esr_disable,
         .apic_destination_logical       = APIC_DEST_LOGICAL,
         .check_apicid_used              = check_apicid_used,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 6daddb6949d2..4b84b5970fbe 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -55,7 +55,7 @@ struct genapic apic_numaq = {
         /* physical delivery on LOCAL quad: */
         .irq_dest_mode                  = 0,
 
-        .target_cpus                    = target_cpus,
+        .target_cpus                    = numaq_target_cpus,
         .ESR_DISABLE                    = esr_disable,
         .apic_destination_logical       = APIC_DEST_LOGICAL,
         .check_apicid_used              = check_apicid_used,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 1b9164b92b0a..e6b956a08484 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -48,7 +48,7 @@ struct genapic apic_summit = {
         /* logical delivery broadcast to all CPUs: */
         .irq_dest_mode                  = 1,
 
-        .target_cpus                    = target_cpus,
+        .target_cpus                    = summit_target_cpus,
         .ESR_DISABLE                    = esr_disable,
         .apic_destination_logical       = APIC_DEST_LOGICAL,
         .check_apicid_used              = check_apicid_used,