aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTejun Heo2011-07-14 04:46:03 -0500
committerH. Peter Anvin2011-07-14 13:47:52 -0500
commitc378ddd53f9b8832a46fd4fec050a97fc2269858 (patch)
treeef90f814ce569ef1cd3b6e64ea403d909f9d2c53 /arch
parent474b881bf4ee86aba55d46a4fdf293de32cba91b (diff)
downloadkernel-common-c378ddd53f9b8832a46fd4fec050a97fc2269858.tar.gz
kernel-common-c378ddd53f9b8832a46fd4fec050a97fc2269858.tar.xz
kernel-common-c378ddd53f9b8832a46fd4fec050a97fc2269858.zip
memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option
From 6839454ae63f1eb21e515c10229ca95c22955fec Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@kernel.org> Date: Thu, 14 Jul 2011 11:22:17 +0200 Make ARCH_DISCARD_MEMBLOCK a config option so that it can be handled together with other MEMBLOCK options. Signed-off-by: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/20110714094603.GH3455@htj.dyndns.org Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/x86/include/asm/memblock.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 97f08941dd7..28116d4f7b6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -26,6 +26,7 @@ config X86
26 select HAVE_KPROBES 26 select HAVE_KPROBES
27 select HAVE_MEMBLOCK 27 select HAVE_MEMBLOCK
28 select HAVE_MEMBLOCK_NODE_MAP 28 select HAVE_MEMBLOCK_NODE_MAP
29 select ARCH_DISCARD_MEMBLOCK
29 select ARCH_WANT_OPTIONAL_GPIOLIB 30 select ARCH_WANT_OPTIONAL_GPIOLIB
30 select ARCH_WANT_FRAME_POINTERS 31 select ARCH_WANT_FRAME_POINTERS
31 select HAVE_DMA_ATTRS 32 select HAVE_DMA_ATTRS
diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
index 17a882e90ad..bc5667081ae 100644
--- a/arch/x86/include/asm/memblock.h
+++ b/arch/x86/include/asm/memblock.h
@@ -1,8 +1,6 @@
1#ifndef _X86_MEMBLOCK_H 1#ifndef _X86_MEMBLOCK_H
2#define _X86_MEMBLOCK_H 2#define _X86_MEMBLOCK_H
3 3
4#define ARCH_DISCARD_MEMBLOCK
5
6void memblock_x86_reserve_range(u64 start, u64 end, char *name); 4void memblock_x86_reserve_range(u64 start, u64 end, char *name);
7void memblock_x86_free_range(u64 start, u64 end); 5void memblock_x86_free_range(u64 start, u64 end);
8 6