x86, apic: refactor ->cpu_mask_to_apicid*()

- spread out the namespace on a per driver basis

 - clean up the functions

 - get rid of macros

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index ee52c59aa3a4..22c2c7b8e4ab 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -94,8 +94,8 @@ struct genapic apic_bigsmp = {
         .set_apic_id                    = NULL,
         .apic_id_mask                   = 0xFF << 24,
 
-        .cpu_mask_to_apicid             = cpu_mask_to_apicid,
-        .cpu_mask_to_apicid_and         = cpu_mask_to_apicid_and,
+        .cpu_mask_to_apicid             = bigsmp_cpu_mask_to_apicid,
+        .cpu_mask_to_apicid_and         = bigsmp_cpu_mask_to_apicid_and,
 
         .send_IPI_mask                  = send_IPI_mask,
         .send_IPI_mask_allbutself       = NULL,