diff options
| author | Tejun Heo | 2011-07-14 04:46:03 -0500 |
|---|---|---|
| committer | H. Peter Anvin | 2011-07-14 13:47:52 -0500 |
| commit | c378ddd53f9b8832a46fd4fec050a97fc2269858 (patch) | |
| tree | ef90f814ce569ef1cd3b6e64ea403d909f9d2c53 /mm/memblock.c | |
| parent | 474b881bf4ee86aba55d46a4fdf293de32cba91b (diff) | |
| download | kernel-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 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index c4a8750406f..ebc6119f128 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
| @@ -959,7 +959,7 @@ static int __init early_memblock(char *p) | |||
| 959 | } | 959 | } |
| 960 | early_param("memblock", early_memblock); | 960 | early_param("memblock", early_memblock); |
| 961 | 961 | ||
| 962 | #if defined(CONFIG_DEBUG_FS) && !defined(ARCH_DISCARD_MEMBLOCK) | 962 | #if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_ARCH_DISCARD_MEMBLOCK) |
| 963 | 963 | ||
| 964 | static int memblock_debug_show(struct seq_file *m, void *private) | 964 | static int memblock_debug_show(struct seq_file *m, void *private) |
| 965 | { | 965 | { |