Revert "powerpc/powernv: Increase memory block size to 1GB on radix"

[mirror_ubuntu-bionic-kernel.git] / arch / powerpc / platforms / powernv / setup.c

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 7de050a3736b491cb22228d23d08bae1d33dba9b..34e36f91a38e11ea2e3d4cb1e371f34e17b05376 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -131,6 +131,7 @@ static void __init pnv_setup_arch(void)
        set_arch_panic_timeout(10, ARCH_PANIC_TIMEOUT);
 
        pnv_setup_rfi_flush();
+       setup_stf_barrier();
 
        /* Initialize SMP */
        pnv_smp_init();
@@ -361,15 +362,7 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)
 #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
 static unsigned long pnv_memory_block_size(void)
 {
-       /*
-        * We map the kernel linear region with 1GB large pages on radix. For
-        * memory hot unplug to work our memory block size must be at least
-        * this size.
-        */
-       if (radix_enabled())
-               return 1UL * 1024 * 1024 * 1024;
-       else
-               return 256UL * 1024 * 1024;
+       return 256UL * 1024 * 1024;
 }
 #endif