From: Tejun Heo <tj@kernel.org>
Date: Thu, 14 Jul 2011 09:42:03 +0000 (+0200)
Subject: memblock: Use __meminit[data] instead of __init[data]
X-Git-Tag: next-20111209~5^2~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=67e24bcb725cabd15ef577bf301275d03d6086d7;p=karo-tx-linux.git

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>
---

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
 
 
 #ifdef ARCH_DISCARD_MEMBLOCK
-#define __init_memblock __init
-#define __initdata_memblock __initdata
+#define __init_memblock __meminit
+#define __initdata_memblock __meminitdata
 #else
 #define __init_memblock
 #define __initdata_memblock