From aeaecf457cff43dc575954be3b2f9aca45bcebf4 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 2 May 2013 09:15:58 +0200
Subject: [PATCH] --- yaml --- r: 373279 b: refs/heads/master c:
 e5d709bb5fb758281b5a5dbda50823bb68b3a066 h: refs/heads/master i:   373277:
 dc10dd1bbc654c232019b38b50297a2d5053e083   373275:
 9d0d8d9c2259211741b1d88c225162e92912891d   373271:
 b8efd69c4fc50a747ee33e67b121618a7ac18382   373263:
 6a59f91a4ae9bdc73b1bef722515e9c384050a09   373247:
 30061d9a3d6c181c61e1bba4c0abe486175057cf v: v3

---
 [refs]                    |  2 +-
 trunk/arch/s390/mm/init.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b1240c40f16..0a78c5674c31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1bd59c5cc247d1d02588ff0a4e86a0cc5f9733
+refs/heads/master: e5d709bb5fb758281b5a5dbda50823bb68b3a066
diff --git a/trunk/arch/s390/mm/init.c b/trunk/arch/s390/mm/init.c
index 0b09b2342302..89ebae4008f2 100644
--- a/trunk/arch/s390/mm/init.c
+++ b/trunk/arch/s390/mm/init.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>
+#include <linux/memory.h>
 #include <linux/pfn.h>
 #include <linux/poison.h>
 #include <linux/initrd.h>
@@ -36,6 +37,7 @@
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
 #include <asm/ctl_reg.h>
+#include <asm/sclp.h>
 
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));
 
@@ -214,6 +216,15 @@ int arch_add_memory(int nid, u64 start, u64 size)
 	return rc;
 }
 
+unsigned long memory_block_size_bytes(void)
+{
+	/*
+	 * Make sure the memory block size is always greater
+	 * or equal than the memory increment size.
+	 */
+	return max_t(unsigned long, MIN_MEMORY_BLOCK_SIZE, sclp_get_rzm());
+}
+
 #ifdef CONFIG_MEMORY_HOTREMOVE
 int arch_remove_memory(u64 start, u64 size)
 {