diff options
| author | Tejun Heo <tj@kernel.org> | 2011-07-14 05:46:03 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-14 14:47:52 -0400 |
| commit | c378ddd53f9b8832a46fd4fec050a97fc2269858 (patch) | |
| tree | ef90f814ce569ef1cd3b6e64ea403d909f9d2c53 /include/linux/memblock.h | |
| parent | 474b881bf4ee86aba55d46a4fdf293de32cba91b (diff) | |
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 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 31def584cceb..2491355bb6e4 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
| @@ -197,7 +197,7 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo | |||
| 197 | region++) | 197 | region++) |
| 198 | 198 | ||
| 199 | 199 | ||
| 200 | #ifdef ARCH_DISCARD_MEMBLOCK | 200 | #ifdef CONFIG_ARCH_DISCARD_MEMBLOCK |
| 201 | #define __init_memblock __meminit | 201 | #define __init_memblock __meminit |
| 202 | #define __initdata_memblock __meminitdata | 202 | #define __initdata_memblock __meminitdata |
| 203 | #else | 203 | #else |