From: Wen Congyang <wency@cn.fujitsu.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org,
linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
linux-ia64@vger.kernel.org, cmetcalf@tilera.com
Cc: len.brown@intel.com,
Yasuaki ISIMATU <isimatu.yasuaki@jp.fujitsu.com>,
paulus@samba.org, minchan.kim@gmail.com,
kosaki.motohiro@jp.fujitsu.com, rientjes@google.com,
cl@linux.com, akpm@linux-foundation.org, liuj97@gmail.com
Subject: [RFC PATCH v5 14/19] memory-hotplug: move register_page_bootmem_info_node and put_page_bootmem for sparse-vmemmap
Date: Fri, 27 Jul 2012 18:33:33 +0800 [thread overview]
Message-ID: <50126E7D.1070807@cn.fujitsu.com> (raw)
In-Reply-To: <50126B83.3050201@cn.fujitsu.com>
From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
For implementing register_page_bootmem_info_node of sparse-vmemmap,
register_page_bootmem_info_node and put_page_bootmem are moved to
memory_hotplug.c
CC: David Rientjes <rientjes@google.com>
CC: Jiang Liu <liuj97@gmail.com>
CC: Len Brown <len.brown@intel.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: Christoph Lameter <cl@linux.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
include/linux/memory_hotplug.h | 9 ---------
mm/memory_hotplug.c | 8 ++++++--
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 0d500be..fe50a9b 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -162,17 +162,8 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
#endif /* CONFIG_NUMA */
#endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */
-#ifdef CONFIG_SPARSEMEM_VMEMMAP
-static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
-{
-}
-static inline void put_page_bootmem(struct page *page)
-{
-}
-#else
extern void register_page_bootmem_info_node(struct pglist_data *pgdat);
extern void put_page_bootmem(struct page *page);
-#endif
/*
* Lock for memory hotplug guarantees 1) all callbacks for memory hotplug
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index eae946b..180d555 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -91,7 +91,6 @@ static void release_memory_resource(struct resource *res)
}
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
-#ifndef CONFIG_SPARSEMEM_VMEMMAP
static void get_page_bootmem(unsigned long info, struct page *page,
unsigned long type)
{
@@ -127,6 +126,7 @@ void __ref put_page_bootmem(struct page *page)
}
+#ifndef CONFIG_SPARSEMEM_VMEMMAP
static void register_page_bootmem_info_section(unsigned long start_pfn)
{
unsigned long *usemap, mapsize, section_nr, i;
@@ -163,6 +163,11 @@ static void register_page_bootmem_info_section(unsigned long start_pfn)
get_page_bootmem(section_nr, page, MIX_SECTION_INFO);
}
+#else
+static inline void register_page_bootmem_info_section(unsigned long start_pfn)
+{
+}
+#endif
void register_page_bootmem_info_node(struct pglist_data *pgdat)
{
@@ -198,7 +203,6 @@ void register_page_bootmem_info_node(struct pglist_data *pgdat)
register_page_bootmem_info_section(pfn);
}
-#endif /* !CONFIG_SPARSEMEM_VMEMMAP */
static void grow_zone_span(struct zone *zone, unsigned long start_pfn,
unsigned long end_pfn)
--
1.7.1
next prev parent reply other threads:[~2012-07-27 10:28 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-27 10:20 [RFC PATCH v5 00/19] memory-hotplug: hot-remove physical memory Wen Congyang
2012-07-27 10:22 ` [RFC PATCH 0/19] firmware_map : unify argument of firmware_map_add_early/hotplug Wen Congyang
2012-07-27 10:24 ` [PATCH 0.5/19] remove memory info from list before freeing it Wen Congyang
2012-07-27 10:25 ` [RFC PATCH v5 01/19] memory-hotplug: rename remove_memory() to offline_memory()/offline_pages() Wen Congyang
2012-07-27 10:26 ` [RFC PATCH v5 02/19] memory-hotplug: implement offline_memory() Wen Congyang
2012-07-27 10:27 ` [RFC PATCH v5 03/19] memory-hotplug: store the node id in acpi_memory_device Wen Congyang
2012-07-27 10:27 ` [RFC PATCH v5 04/19] memory-hotplug: offline and remove memory when removing the memory device Wen Congyang
2012-07-27 10:28 ` [RFC PATCH v5 05/19] memory-hotplug: check whether memory is present or not Wen Congyang
2012-07-27 20:17 ` Tony Luck
2012-07-30 1:57 ` Wen Congyang
2012-07-27 10:28 ` [RFC PATCH v5 06/19] memory-hotplug: export the function acpi_bus_remove() Wen Congyang
2012-07-27 10:29 ` [RFC PATCH v5 07/19] memory-hotplug: call acpi_bus_remove() to remove memory device Wen Congyang
2012-07-27 10:30 ` [RFC PATCH v5 08/19] memory-hotplug: remove /sys/firmware/memmap/X sysfs Wen Congyang
2012-07-27 10:30 ` [RFC PATCH v5 09/19] memory-hotplug: does not release memory region in PAGES_PER_SECTION chunks Wen Congyang
2012-07-27 10:31 ` [RFC PATCH v5 10/19] memory-hotplug: add memory_block_release Wen Congyang
2012-07-27 10:31 ` [RFC PATCH v5 11/19] memory-hotplug: remove_memory calls __remove_pages Wen Congyang
2012-07-27 10:32 ` [RFC PATCH v5 12/19] memory-hotplug: introduce new function arch_remove_memory() Wen Congyang
2012-07-30 10:23 ` Heiko Carstens
2012-07-30 10:35 ` Wen Congyang
2012-07-31 12:40 ` Gerald Schaefer
2012-08-01 1:42 ` Wen Congyang
2012-08-01 2:44 ` jencce zhou
2012-08-01 6:06 ` Wen Congyang
2012-07-27 10:32 ` [RFC PATCH v5 13/19] memory-hotplug: check page type in get_page_bootmem Wen Congyang
2012-07-27 10:33 ` Wen Congyang [this message]
2012-07-27 10:34 ` [RFC PATCH v5 15/19] memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap Wen Congyang
2012-07-27 10:34 ` [RFC PATCH v5 16/19] memory-hotplug: free memmap " Wen Congyang
2012-07-31 12:22 ` Gerald Schaefer
2012-08-01 6:09 ` Wen Congyang
2012-07-27 10:35 ` [RFC PATCH v5 17/19] memory_hotplug: clear zone when the memory is removed Wen Congyang
2012-07-27 10:35 ` [RFC PATCH v5 00/19] memory-hotplug: hot-remove physical memory Yasuaki Ishimatsu
2012-07-27 10:35 ` [RFC PATCH v5 18/19] memory-hotplug: add node_device_release Wen Congyang
2012-07-27 10:36 ` [RFC PATCH v5 19/19] memory-hotplug: remove sysfs file of node Wen Congyang
2012-07-27 10:45 ` Yasuaki Ishimatsu
2012-07-30 2:03 ` Wen Congyang
2012-07-30 3:47 ` Wen Congyang
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=50126E7D.1070807@cn.fujitsu.com \
--to=wency@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=cmetcalf@tilera.com \
--cc=isimatu.yasuaki@jp.fujitsu.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liuj97@gmail.com \
--cc=minchan.kim@gmail.com \
--cc=paulus@samba.org \
--cc=rientjes@google.com \
/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).