The patch titled
memory hotplug: small fixes to bootmem freeing for memory hotremove
has been removed from the -mm tree. Its filename was
memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memory hotplug: small fixes to bootmem freeing for memory hotremove
From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
- Change some naming
* Magic -> types
* MIX_INFO -> MIX_SECTION_INFO
* Change definition of bootmem type from direct hex value
- __free_pages_bootmem() becomes __meminit.
Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Cc: Badari Pulavarty <pbadari@xxxxxxxxxx>
Cc: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memory_hotplug.h | 8 ++++----
mm/memory_hotplug.c | 12 ++++++------
mm/page_alloc.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff -puN include/linux/memory_hotplug.h~memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove include/linux/memory_hotplug.h
--- a/include/linux/memory_hotplug.h~memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove
+++ a/include/linux/memory_hotplug.h
@@ -13,12 +13,12 @@ struct mem_section;
#ifdef CONFIG_MEMORY_HOTPLUG
/*
- * Magic number for free bootmem.
+ * Types for free bootmem.
* The normal smallest mapcount is -1. Here is smaller value than it.
*/
-#define SECTION_INFO 0xfffffffe
-#define MIX_INFO 0xfffffffd
-#define NODE_INFO 0xfffffffc
+#define SECTION_INFO (-1 - 1)
+#define MIX_SECTION_INFO (-1 - 2)
+#define NODE_INFO (-1 - 3)
/*
* pgdat resizing functions
diff -puN mm/memory_hotplug.c~memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove
+++ a/mm/memory_hotplug.c
@@ -62,9 +62,9 @@ static void release_memory_resource(stru
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
#ifndef CONFIG_SPARSEMEM_VMEMMAP
-static void get_page_bootmem(unsigned long info, struct page *page, int magic)
+static void get_page_bootmem(unsigned long info, struct page *page, int type)
{
- atomic_set(&page->_mapcount, magic);
+ atomic_set(&page->_mapcount, type);
SetPagePrivate(page);
set_page_private(page, info);
atomic_inc(&page->_count);
@@ -72,10 +72,10 @@ static void get_page_bootmem(unsigned lo
void put_page_bootmem(struct page *page)
{
- int magic;
+ int type;
- magic = atomic_read(&page->_mapcount);
- BUG_ON(magic >= -1);
+ type = atomic_read(&page->_mapcount);
+ BUG_ON(type >= -1);
if (atomic_dec_return(&page->_count) == 1) {
ClearPagePrivate(page);
@@ -119,7 +119,7 @@ static void register_page_bootmem_info_s
mapsize = PAGE_ALIGN(usemap_size()) >> PAGE_SHIFT;
for (i = 0; i < mapsize; i++, page++)
- get_page_bootmem(section_nr, page, MIX_INFO);
+ get_page_bootmem(section_nr, page, MIX_SECTION_INFO);
}
diff -puN mm/page_alloc.c~memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove mm/page_alloc.c
--- a/mm/page_alloc.c~memory-hotplug-small-fixes-to-bootmem-freeing-for-memory-hotremove
+++ a/mm/page_alloc.c
@@ -533,7 +533,7 @@ static void __free_pages_ok(struct page
/*
* permit the bootmem allocator to evade page validation on high-order frees
*/
-void __free_pages_bootmem(struct page *page, unsigned int order)
+void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
{
if (order == 0) {
__ClearPageReserved(page);
_
Patches currently in -mm which might be from y-goto@xxxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
