--- v5
+++ v6
@@ -8,6 +8,7 @@
(I don't know how to implement it for s390).
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
+Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
---
arch/ia64/mm/init.c | 18 ++++++++++++++++++
arch/powerpc/mm/mem.c | 12 ++++++++++++
@@ -21,10 +22,10 @@
9 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
-index 082e383..e333822 100644
+index b755ea9..20bc967 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
-@@ -689,6 +689,24 @@ int arch_add_memory(int nid, u64 start, u64 size)
+@@ -688,6 +688,24 @@ int arch_add_memory(int nid, u64 start, u64 size)
return ret;
}
@@ -200,10 +201,10 @@
/* reasonably generic interface to expand the physical pages in a zone */
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
-index 1f5b5bb..2c5d734 100644
+index 9fd5904..f6724c2 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
-@@ -1487,6 +1487,8 @@ repeat:
+@@ -1514,6 +1514,8 @@ repeat:
/* remove memmap entry */
firmware_map_remove(start, start + size, "System RAM");