x86: Fix an incorrect argument of reserve_bootmem()

[mv-sheeva.git] / arch / sparc / mm / init_64.c

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 785f0a24fcbf37d4bc2a83551479d7a397fcb1aa..ed6be6ba2f4e9f7859c3e34b27fdc8e5ccc6f5ab 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1679,11 +1679,6 @@ pgd_t swapper_pg_dir[2048];
 static void sun4u_pgprot_init(void);
 static void sun4v_pgprot_init(void);
 
-/* Dummy function */
-void __init setup_per_cpu_areas(void)
-{
-}
-
 void __init paging_init(void)
 {
        unsigned long end_pfn, shift, phys_base;
@@ -1801,14 +1796,18 @@ void __init paging_init(void)
 
        prom_build_devicetree();
        of_populate_present_mask();
+#ifndef CONFIG_SMP
+       of_fill_in_cpu_data();
+#endif
 
        if (tlb_type == hypervisor) {
                sun4v_mdesc_init();
-               mdesc_populate_present_mask(CPU_MASK_ALL_PTR);
+               mdesc_populate_present_mask(cpu_all_mask);
+#ifndef CONFIG_SMP
+               mdesc_fill_in_cpu_data(cpu_all_mask);
+#endif
        }
 
-       real_setup_per_cpu_areas();
-
        /* Once the OF device tree and MDESC have been setup, we know
         * the list of possible cpus.  Therefore we can allocate the
         * IRQ stacks.