From 62485e4918a4abe4d00a1be3b6959b5cde4854cc Mon Sep 17 00:00:00 2001 From: Yasuaki Ishimatsu Date: Wed, 10 Oct 2012 15:53:53 -0700 Subject: [PATCH] --- yaml --- r: 333266 b: refs/heads/master c: 1633dbbacbaa3a2f95ef901caf9d0b32728c10b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/hotplug-memory.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4797fbaf2fda..a596779d26ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 158544b165d362c23acdde0104d9aab505a262a6 +refs/heads/master: 1633dbbacbaa3a2f95ef901caf9d0b32728c10b6 diff --git a/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c b/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c index 2fe690fcaa1d..ecdb0a6b3171 100644 --- a/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/trunk/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -77,8 +77,9 @@ static int pseries_remove_memblock(unsigned long base, unsigned int memblock_siz { unsigned long start, start_pfn; struct zone *zone; - int i, ret; - int sections_to_remove; + int ret; + unsigned long section; + unsigned long sections_to_remove; start_pfn = base >> PAGE_SHIFT; @@ -99,8 +100,8 @@ static int pseries_remove_memblock(unsigned long base, unsigned int memblock_siz * while writing to it. So we have to defer it to here. */ sections_to_remove = (memblock_size >> PAGE_SHIFT) / PAGES_PER_SECTION; - for (i = 0; i < sections_to_remove; i++) { - unsigned long pfn = start_pfn + i * PAGES_PER_SECTION; + for (section = 0; section < sections_to_remove; section++) { + unsigned long pfn = start_pfn + section * PAGES_PER_SECTION; ret = __remove_pages(zone, pfn, PAGES_PER_SECTION); if (ret) return ret;