From 2dd91c7c583a9dad92ddf8179444c625530f9c6d Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 8 Dec 2011 10:22:09 -0800
Subject: [PATCH] --- yaml --- r: 277181 b: refs/heads/master c:
 ff38df377cfd23472fc0de63108781ad2388efbf h: refs/heads/master i:   277179:
 8853ae9f03e9fa09c2b1ca60680fe5d35e6d9689 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/Kconfig        | 3 +++
 trunk/arch/s390/kernel/setup.c | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ddbc50822ce2..c4dae520f0ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d15ffc824a90842b16592f3a960836841bd6c58
+refs/heads/master: ff38df377cfd23472fc0de63108781ad2388efbf
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 373679b3744a..e383caf251a3 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -92,6 +92,9 @@ config S390
 	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
 	select HAVE_RCU_TABLE_FREE if SMP
 	select ARCH_SAVE_PAGE_KEYS if HIBERNATION
+	select HAVE_MEMBLOCK
+	select HAVE_MEMBLOCK_NODE_MAP
+	select ARCH_DISCARD_MEMBLOCK
 	select ARCH_INLINE_SPIN_TRYLOCK
 	select ARCH_INLINE_SPIN_TRYLOCK_BH
 	select ARCH_INLINE_SPIN_LOCK
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index e58a462949b1..a2850df006ef 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
+#include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/stddef.h>
 #include <linux/unistd.h>
@@ -820,7 +821,8 @@ setup_memory(void)
 		end_chunk = min(end_chunk, end_pfn);
 		if (start_chunk >= end_chunk)
 			continue;
-		add_active_range(0, start_chunk, end_chunk);
+		memblock_add_node(PFN_PHYS(start_chunk),
+				  PFN_PHYS(end_chunk - start_chunk), 0);
 		pfn = max(start_chunk, start_pfn);
 		for (; pfn < end_chunk; pfn++)
 			page_set_storage_key(PFN_PHYS(pfn),