The patch titled
memory hotplug: fix compile error for i386 with NUMA config
has been removed from the -mm tree. Its filename was
memory-hotplug-fix-compile-error-for-i386-with-numa-config.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: memory hotplug: fix compile error for i386 with NUMA config
From: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
This patch is to fix compile error when config memory hotplug with numa on
i386.
The cause of compile error was missing of arch_add_memory(),
remove_memory(), and memory_add_physaddr_to_nid().
Signed-off-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mm/discontig.c | 17 +++++++++++++++++
arch/i386/mm/init.c | 9 +--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff -puN arch/i386/mm/discontig.c~memory-hotplug-fix-compile-error-for-i386-with-numa-config arch/i386/mm/discontig.c
--- a/arch/i386/mm/discontig.c~memory-hotplug-fix-compile-error-for-i386-with-numa-config
+++ a/arch/i386/mm/discontig.c
@@ -405,3 +405,20 @@ void __init set_highmem_pages_init(int b
totalram_pages += totalhigh_pages;
#endif
}
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+/* This is the case that there is no _PXM on DSDT for added memory */
+int memory_add_physaddr_to_nid(u64 addr)
+{
+ int nid;
+ unsigned long pfn = addr >> PAGE_SHIFT;
+
+ for (nid = 0; nid < MAX_NUMNODES; nid++){
+ if (node_start_pfn[nid] <= pfn &&
+ pfn < node_end_pfn[nid])
+ return nid;
+ }
+
+ return 0;
+}
+#endif
diff -puN arch/i386/mm/init.c~memory-hotplug-fix-compile-error-for-i386-with-numa-config arch/i386/mm/init.c
--- a/arch/i386/mm/init.c~memory-hotplug-fix-compile-error-for-i386-with-numa-config
+++ a/arch/i386/mm/init.c
@@ -673,16 +673,10 @@ void __init mem_init(void)
#endif
}
-/*
- * this is for the non-NUMA, single node SMP system case.
- * Specifically, in the case of x86, we will always add
- * memory to the highmem for now.
- */
#ifdef CONFIG_MEMORY_HOTPLUG
-#ifndef CONFIG_NEED_MULTIPLE_NODES
int arch_add_memory(int nid, u64 start, u64 size)
{
- struct pglist_data *pgdata = &contig_page_data;
+ struct pglist_data *pgdata = NODE_DATA(nid);
struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM;
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -695,7 +689,6 @@ int remove_memory(u64 start, u64 size)
return -EINVAL;
}
#endif
-#endif
struct kmem_cache *pgd_cache;
struct kmem_cache *pmd_cache;
_
Patches currently in -mm which might be from y-goto@xxxxxxxxxxxxxx are
memory-hotplug-fix-compile-error-for-i386-with-numa-config.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
