diff options
| author | Tejun Heo <tj@kernel.org> | 2011-07-14 05:42:03 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-14 14:47:42 -0400 |
| commit | 67e24bcb725cabd15ef577bf301275d03d6086d7 (patch) | |
| tree | c63765f42ba9f7749796c7204a97b8ceaf52db2f | |
| parent | 784656f9c680d334e7b4cdb6951c5c913e5a26bf (diff) | |
memblock: Use __meminit[data] instead of __init[data]
From 19ab281ed67b87a6623d725237a7333ca79f1e75 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 14 Jul 2011 11:22:16 +0200
memblock will be extended to include early_node_map[], which is also
used during memory hotplug. Make memblock use __meminit[data] instead
of __init[data] so that memory hotplug code can safely reference it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20110714094203.GE3455@htj.dyndns.org
Reported-by: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | include/linux/memblock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index aa5df9e11fff..434b958a4f5f 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h | |||
| @@ -152,8 +152,8 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo | |||
| 152 | 152 | ||
| 153 | 153 | ||
| 154 | #ifdef ARCH_DISCARD_MEMBLOCK | 154 | #ifdef ARCH_DISCARD_MEMBLOCK |
| 155 | #define __init_memblock __init | 155 | #define __init_memblock __meminit |
| 156 | #define __initdata_memblock __initdata | 156 | #define __initdata_memblock __meminitdata |
| 157 | #else | 157 | #else |
| 158 | #define __init_memblock | 158 | #define __init_memblock |
| 159 | #define __initdata_memblock | 159 | #define __initdata_memblock |