2 files changed, 2 insertions, 2 deletions

diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index cfb3d06058ff..fa44eaf8d897 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1542,5 +1542,5 @@ void __init setup_per_cpu_areas(void)
 
         of_fill_in_cpu_data();
         if (tlb_type == hypervisor)
-                mdesc_fill_in_cpu_data(CPU_MASK_ALL_PTR);
+                mdesc_fill_in_cpu_data(cpu_all_mask);
 }
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index b5a5932def77..ca92e2f54e4d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1799,7 +1799,7 @@ void __init paging_init(void)
 
         if (tlb_type == hypervisor) {
                 sun4v_mdesc_init();
-                mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
+                mdesc_populate_present_mask(cpu_all_mask);
         }
 
         /* Once the OF device tree and MDESC have been setup, we know