--- v3
+++ v4
@@ -10,24 +10,24 @@
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: 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: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
arch/powerpc/platforms/pseries/hotplug-memory.c | 5 +----
include/linux/memory_hotplug.h | 3 +--
- mm/memory_hotplug.c | 20 +++++++++++++-------
- 3 files changed, 15 insertions(+), 13 deletions(-)
+ mm/memory_hotplug.c | 19 ++++++++++++-------
+ 3 files changed, 14 insertions(+), 13 deletions(-)
-Index: linux-3.5-rc4/mm/memory_hotplug.c
+Index: linux-3.5-rc6/mm/memory_hotplug.c
===================================================================
---- linux-3.5-rc4.orig/mm/memory_hotplug.c 2012-07-03 14:22:05.919169458 +0900
-+++ linux-3.5-rc4/mm/memory_hotplug.c 2012-07-03 14:22:10.170116406 +0900
+--- linux-3.5-rc6.orig/mm/memory_hotplug.c 2012-07-18 18:00:27.440145432 +0900
++++ linux-3.5-rc6/mm/memory_hotplug.c 2012-07-18 18:01:02.070712487 +0900
@@ -275,11 +275,14 @@ static int __meminit __add_section(int n
#ifdef CONFIG_SPARSEMEM_VMEMMAP
static int __remove_section(struct zone *zone, struct mem_section *ms)
@@ -37,7 +37,7 @@
- * This should be removed later.
- */
- return -EBUSY;
-+ int ret;
++ int ret = -EINVAL;
+
+ if (!valid_section(ms))
+ return ret;
@@ -59,7 +59,7 @@
unsigned long i, ret = 0;
int sections_to_remove;
+ struct zone *zone;
-
+
/*
* We can only remove entire sections
@@ -363,6 +366,7 @@ int __remove_pages(struct zone *zone, un
@@ -70,19 +70,18 @@
ret = __remove_section(zone, __pfn_to_section(pfn));
if (ret)
break;
-@@ -664,6 +668,8 @@ int remove_memory(int nid, u64 start, u6
- lock_memory_hotplug();
+@@ -1031,6 +1035,7 @@ int __ref remove_memory(int nid, u64 sta
/* remove memmap entry */
- firmware_map_remove(start, start + size - 1, "System RAM");
-+
+ firmware_map_remove(start, start + size, "System RAM");
+
+ __remove_pages(start >> PAGE_SHIFT, size >> PAGE_SHIFT);
+ out:
unlock_memory_hotplug();
- return 0;
-
-Index: linux-3.5-rc4/include/linux/memory_hotplug.h
+ return ret;
+Index: linux-3.5-rc6/include/linux/memory_hotplug.h
===================================================================
---- linux-3.5-rc4.orig/include/linux/memory_hotplug.h 2012-07-03 14:21:58.330264047 +0900
-+++ linux-3.5-rc4/include/linux/memory_hotplug.h 2012-07-03 14:22:10.170116406 +0900
+--- linux-3.5-rc6.orig/include/linux/memory_hotplug.h 2012-07-18 18:00:27.445145371 +0900
++++ linux-3.5-rc6/include/linux/memory_hotplug.h 2012-07-18 18:00:40.461982690 +0900
@@ -89,8 +89,7 @@ extern bool is_pageblock_removable_noloc
/* reasonably generic interface to expand the physical pages in a zone */
extern int __add_pages(int nid, struct zone *zone, unsigned long start_pfn,
@@ -90,14 +89,13 @@
-extern int __remove_pages(struct zone *zone, unsigned long start_pfn,
- unsigned long nr_pages);
+extern int __remove_pages(unsigned long start_pfn, unsigned long nr_pages);
-
+
#ifdef CONFIG_NUMA
extern int memory_add_physaddr_to_nid(u64 start);
-Index: linux-3.5-rc4/arch/powerpc/platforms/pseries/hotplug-memory.c
+Index: linux-3.5-rc6/arch/powerpc/platforms/pseries/hotplug-memory.c
===================================================================
---- linux-3.5-rc4.orig/arch/powerpc/platforms/pseries/hotplug-memory.c 2012-07-03 14:22:05.920169437
-+0900
-+++ linux-3.5-rc4/arch/powerpc/platforms/pseries/hotplug-memory.c 2012-07-03 14:22:10.172116353 +0900
+--- linux-3.5-rc6.orig/arch/powerpc/platforms/pseries/hotplug-memory.c 2012-07-18 18:00:27.442145407 +0900
++++ linux-3.5-rc6/arch/powerpc/platforms/pseries/hotplug-memory.c 2012-07-18 18:00:40.470982578 +0900
@@ -76,7 +76,6 @@ unsigned long memory_block_size_bytes(vo
static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
{
@@ -105,11 +103,11 @@
- struct zone *zone;
int i, ret;
int sections_to_remove;
-
+
@@ -87,8 +86,6 @@ static int pseries_remove_memblock(unsig
return 0;
}
-
+
- zone = page_zone(pfn_to_page(start_pfn));
-
/*