From: tip-bot for Tejun Heo <tj@kernel.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
benh@kernel.crashing.org, yinghai@kernel.org, tj@kernel.org,
tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/memblock] memblock: Use __meminit[data] instead of __init[data]
Date: Thu, 14 Jul 2011 21:32:30 GMT [thread overview]
Message-ID: <tip-67e24bcb725cabd15ef577bf301275d03d6086d7@git.kernel.org> (raw)
In-Reply-To: <20110714094203.GE3455@htj.dyndns.org>
Commit-ID: 67e24bcb725cabd15ef577bf301275d03d6086d7
Gitweb: http://git.kernel.org/tip/67e24bcb725cabd15ef577bf301275d03d6086d7
Author: Tejun Heo <tj@kernel.org>
AuthorDate: Thu, 14 Jul 2011 11:42:03 +0200
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 14 Jul 2011 11:47:42 -0700
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>
---
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 aa5df9e..434b958 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
next prev parent reply other threads:[~2011-07-14 21:32 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-12 9:15 [PATCHSET x86/mm] memblock, x86: Allow node info in memblock and remove x86 specific memblock code Tejun Heo
2011-07-12 9:15 ` [PATCH 01/13] memblock: Remove memblock_memory_can_coalesce() Tejun Heo
2011-07-14 21:31 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:15 ` [PATCH 02/13] memblock: Reimplement memblock_add_region() Tejun Heo
2011-07-14 21:32 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:15 ` [PATCH 03/13] memblock: Add optional region->nid Tejun Heo
2011-07-14 9:43 ` [PATCH UPDATED " Tejun Heo
2011-07-14 21:32 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:15 ` [PATCH 04/13] x86: Use HAVE_MEMBLOCK_NODE_MAP Tejun Heo
2011-07-14 1:35 ` H. Peter Anvin
2011-07-14 9:44 ` [PATCH UPDATED " Tejun Heo
2011-07-14 21:33 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:15 ` [PATCH 05/13] x86: Use __memblock_alloc_base() in early_reserve_e820() Tejun Heo
2011-07-14 21:33 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:15 ` [PATCH 06/13] memblock: Implement for_each_free_mem_range() Tejun Heo
2011-07-14 21:34 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:16 ` [PATCH 07/13] x86: Replace memblock_x86_find_in_range_size() with for_each_free_mem_range() Tejun Heo
2011-07-14 21:34 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:16 ` [PATCH 08/13] memblock, x86: Make free_all_memory_core_early() explicitly free lowmem only Tejun Heo
2011-07-14 21:35 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:16 ` [PATCH 09/13] memblock, x86: Replace __get_free_all_memory_range() with for_each_free_mem_range() Tejun Heo
2011-07-14 21:35 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:16 ` [PATCH 10/13] memblock, x86: Reimplement memblock_find_dma_reserve() using iterators Tejun Heo
2011-07-14 21:36 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:16 ` [PATCH 11/13] x86: Use absent_pages_in_range() instead of memblock_x86_hole_size() Tejun Heo
2011-07-14 21:36 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:16 ` [PATCH 12/13] memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option Tejun Heo
2011-07-14 9:46 ` [PATCH UPDATED " Tejun Heo
2011-07-14 21:37 ` [tip:x86/memblock] " tip-bot for Tejun Heo
2011-07-12 9:16 ` [PATCH 13/13] memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones Tejun Heo
2011-07-14 20:10 ` H. Peter Anvin
2011-07-14 20:20 ` Tejun Heo
2011-07-14 20:23 ` H. Peter Anvin
2011-07-14 20:32 ` Tejun Heo
2011-07-14 20:38 ` H. Peter Anvin
2011-07-14 20:41 ` Tejun Heo
2011-07-14 20:43 ` H. Peter Anvin
2011-07-14 21:38 ` [tip:x86/memblock] memblock: Cast phys_addr_t to unsigned long long for printf use tip-bot for H. Peter Anvin
2011-07-14 21:37 ` [tip:x86/memblock] memblock, x86: Replace memblock_x86_reserve/free_range() with generic ones tip-bot for Tejun Heo
2011-07-26 21:06 ` [PATCH 13/13] " Yinghai Lu
2011-07-26 21:46 ` Tejun Heo
2011-07-27 0:59 ` Yinghai Lu
2011-07-27 8:07 ` Tejun Heo
2011-07-12 23:26 ` [PATCHSET x86/mm] memblock, x86: Allow node info in memblock and remove x86 specific memblock code Yinghai Lu
2011-07-13 3:21 ` H. Peter Anvin
2011-07-13 9:16 ` Tejun Heo
2011-07-13 9:11 ` Tejun Heo
2011-07-13 19:06 ` Yinghai Lu
2011-07-14 9:42 ` [PATCH 2.5/13] memblock: Use __meminit[data] instead of __init[data] Tejun Heo
2011-07-14 21:00 ` Yinghai Lu
2011-07-14 21:24 ` H. Peter Anvin
2011-07-15 5:45 ` Tejun Heo
2011-07-14 21:32 ` tip-bot for Tejun Heo [this message]
2011-07-14 9:49 ` [PATCHSET x86/mm] memblock, x86: Allow node info in memblock and remove x86 specific memblock code Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-67e24bcb725cabd15ef577bf301275d03d6086d7@git.kernel.org \
--to=tj@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).