Merge tag 'pm+acpi-4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[deliverable/linux.git] / arch / s390 / numa / mode_emu.c

diff --git a/arch/s390/numa/mode_emu.c b/arch/s390/numa/mode_emu.c
index 30b2698a28e29a6991a7116da1877e5bdee1963e..828d0695d0d4a703e22164bc2b6576c18bc4032a 100644 (file)
--- a/arch/s390/numa/mode_emu.c
+++ b/arch/s390/numa/mode_emu.c
@@ -436,9 +436,15 @@ static void emu_update_cpu_topology(void)
  */
 static unsigned long emu_setup_size_adjust(unsigned long size)
 {
+       unsigned long size_new;
+
        size = size ? : CONFIG_EMU_SIZE;
-       size = roundup(size, memory_block_size_bytes());
-       return size;
+       size_new = roundup(size, memory_block_size_bytes());
+       if (size_new == size)
+               return size;
+       pr_warn("Increasing memory stripe size from %ld MB to %ld MB\n",
+               size >> 20, size_new >> 20);
+       return size_new;
 }
 
 /*