From: Yasuaki Ishimatsu Date: Wed, 10 Oct 2012 22:53:53 +0000 (-0700) Subject: arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1633dbbacbaa3a2f95ef901caf9d0b32728c10b6;p=openwrt%2Fstaging%2Fblogic.git arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups Followups to d760afd4d257 ("memory-hotplug: suppress "Trying to free nonexistent resource " warning"). - use unsigned long type, as overflows are conceivable - rename `i' to the less-misleading and more informative `section' Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 2fe690fcaa1d..ecdb0a6b3171 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/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;