powerpc: Move 64-bit memory reserves to setup_arch()

There is really no need to do them that early, early_setup() runs
before MMU is on, we should do the strict minimum there to get the
MMU going.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 0a6d5f7..155dbcc 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -295,16 +295,6 @@ void __init early_setup(unsigned long dt_ptr)
         */
        cpu_ready_for_interrupts();
 
-       /* Reserve large chunks of memory for use by CMA for KVM */
-       kvm_cma_reserve();
-
-       /*
-        * Reserve any gigantic pages requested on the command line.
-        * memblock needs to have been initialized by the time this is
-        * called since this will reserve memory.
-        */
-       reserve_hugetlb_gpages();
-
        DBG(" <- early_setup()\n");
 
 #ifdef CONFIG_PPC_EARLY_DEBUG_BOOTX
@@ -687,6 +677,17 @@ void __init setup_arch(char **cmdline_p)
        dcache_bsize = ppc64_caches.dline_size;
        icache_bsize = ppc64_caches.iline_size;
 
+
+       /* Reserve large chunks of memory for use by CMA for KVM */
+       kvm_cma_reserve();
+
+       /*
+        * Reserve any gigantic pages requested on the command line.
+        * memblock needs to have been initialized by the time this is
+        * called since this will reserve memory.
+        */
+       reserve_hugetlb_gpages();
+
        if (ppc_md.panic)
                setup_panic();
 
@@ -711,7 +712,6 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_DUMMY_CONSOLE
        conswitchp = &dummy_con;
 #endif
-
        if (ppc_md.setup_arch)
                ppc_md.setup_arch();