x86, apic: refactor ->cpu_mask_to_apicid*()

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / mach-generic / es7000.c

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 3d046dec0c9a5ecbcb20f58d7f13558d233523f2..d758cf65d7366d87426d9b1c7a9193b07dd9c3c0 100644 (file)
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -26,7 +26,7 @@ void __init es7000_update_genapic_to_cluster(void)
 
        apic->init_apic_ldr = es7000_init_apic_ldr_cluster;
 
-       apic->cpu_mask_to_apicid = cpu_mask_to_apicid_cluster;
+       apic->cpu_mask_to_apicid = es7000_cpu_mask_to_apicid_cluster;
 }
 
 static int probe_es7000(void)
@@ -130,8 +130,8 @@ struct genapic apic_es7000 = {
        .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             = es7000_cpu_mask_to_apicid,
+       .cpu_mask_to_apicid_and         = es7000_cpu_mask_to_apicid_and,
 
        .send_IPI_mask                  = send_IPI_mask,
        .send_IPI_mask_allbutself       = NULL,