The patch titled
x86_64 hot-add memory srat.c fix
has been removed from the -mm tree. Its filename is
x86_64-hot-add-memroy-sratc-fix.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86_64 hot-add memory srat.c fix
From: keith mannthey <kmannth@xxxxxxxxxx>
Correct the logic used in srat.c to figure out what
parsing what action to take when registering hot-add areas.
Hot-add areas should only be added to the node information for the
MEMORY_HOTPLGU_RESERVE case. When booting MEMORY_HOTPLUG_SPARSE hot-add
areas on everything but the last node are getting include in the node data
and during kernel boot the pages are setup then the kernel dies when the
pages are used. This patch fixes this issue.
Signed-off-by: Keith Mannthey <kmannth@xxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/mm/srat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/x86_64/mm/srat.c~x86_64-hot-add-memroy-sratc-fix arch/x86_64/mm/srat.c
--- a/arch/x86_64/mm/srat.c~x86_64-hot-add-memroy-sratc-fix
+++ a/arch/x86_64/mm/srat.c
@@ -207,7 +207,7 @@ static inline int save_add_info(void)
return hotadd_percent > 0;
}
#else
-int update_end_of_memory(unsigned long end) {return 0;}
+int update_end_of_memory(unsigned long end) {return -1;}
static int hotadd_enough_memory(struct bootnode *nd) {return 1;}
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
static inline int save_add_info(void) {return 1;}
@@ -337,7 +337,7 @@ acpi_numa_memory_affinity_init(struct ac
push_node_boundaries(node, nd->start >> PAGE_SHIFT,
nd->end >> PAGE_SHIFT);
- if (ma->flags.hot_pluggable && !reserve_hotadd(node, start, end) < 0) {
+ if (ma->flags.hot_pluggable && (reserve_hotadd(node, start, end) < 0)) {
/* Ignore hotadd region. Undo damage */
printk(KERN_NOTICE "SRAT: Hotplug region ignored\n");
*nd = oldnode;
_
Patches currently in -mm which might be from kmannth@xxxxxxxxxx are
-
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
