1 files changed, 4 insertions, 1 deletions

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index f26a352c08a0..c589d6e65668 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1806,9 +1806,12 @@ void __init paging_init(void)
         real_setup_per_cpu_areas();
 
         prom_build_devicetree();
+        of_fill_in_cpu_data();
 
-        if (tlb_type == hypervisor)
+        if (tlb_type == hypervisor) {
                 sun4v_mdesc_init();
+                mdesc_fill_in_cpu_data(CPU_MASK_ALL);
+        }
 
         /* Once the OF device tree and MDESC have been setup, we know
          * the list of possible cpus.  Therefore we can allocate the