From c9a531402337c259049bc8da5e465e65f7b2ffe3 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 14 Jul 2011 11:46:03 +0200
Subject: [PATCH] --- yaml --- r: 277158 b: refs/heads/master c:
 c378ddd53f9b8832a46fd4fec050a97fc2269858 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/Kconfig                | 1 +
 trunk/arch/x86/include/asm/memblock.h | 2 --
 trunk/include/linux/memblock.h        | 2 +-
 trunk/mm/Kconfig                      | 3 +++
 trunk/mm/memblock.c                   | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index eac8c06dcee4..84a383a5064a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 474b881bf4ee86aba55d46a4fdf293de32cba91b
+refs/heads/master: c378ddd53f9b8832a46fd4fec050a97fc2269858
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 97f08941dd79..28116d4f7b64 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -26,6 +26,7 @@ config X86
 	select HAVE_KPROBES
 	select HAVE_MEMBLOCK
 	select HAVE_MEMBLOCK_NODE_MAP
+	select ARCH_DISCARD_MEMBLOCK
 	select ARCH_WANT_OPTIONAL_GPIOLIB
 	select ARCH_WANT_FRAME_POINTERS
 	select HAVE_DMA_ATTRS
diff --git a/trunk/arch/x86/include/asm/memblock.h b/trunk/arch/x86/include/asm/memblock.h
index 17a882e90ada..bc5667081aea 100644
--- a/trunk/arch/x86/include/asm/memblock.h
+++ b/trunk/arch/x86/include/asm/memblock.h
@@ -1,8 +1,6 @@
 #ifndef _X86_MEMBLOCK_H
 #define _X86_MEMBLOCK_H
 
-#define ARCH_DISCARD_MEMBLOCK
-
 void memblock_x86_reserve_range(u64 start, u64 end, char *name);
 void memblock_x86_free_range(u64 start, u64 end);
 
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
index 31def584cceb..2491355bb6e4 100644
--- a/trunk/include/linux/memblock.h
+++ b/trunk/include/linux/memblock.h
@@ -197,7 +197,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
 	     region++)
 
 
-#ifdef ARCH_DISCARD_MEMBLOCK
+#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
 #define __init_memblock __meminit
 #define __initdata_memblock __meminitdata
 #else
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index 30a5d4792b83..7c5697116fcf 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -134,6 +134,9 @@ config HAVE_MEMBLOCK
 config HAVE_MEMBLOCK_NODE_MAP
 	boolean
 
+config ARCH_DISCARD_MEMBLOCK
+	boolean
+
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
 	bool "Allow for memory hot-add"
diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c
index c4a8750406fc..ebc6119f1280 100644
--- a/trunk/mm/memblock.c
+++ b/trunk/mm/memblock.c
@@ -959,7 +959,7 @@ static int __init early_memblock(char *p)
 }
 early_param("memblock", early_memblock);
 
-#if defined(CONFIG_DEBUG_FS) && !defined(ARCH_DISCARD_MEMBLOCK)
+#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_ARCH_DISCARD_MEMBLOCK)
 
 static int memblock_debug_show(struct seq_file *m, void *private)
 {