Merge branch 'akpm' (Fixups from Andrew)

Merge misc fixes from Andrew Morton:
 "Followups, fixes and some random stuff I found on the internet."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (11 patches)
  perf: fix duplicate header inclusion
  memcg, kmem: fix build error when CONFIG_INET is disabled
  rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
  rapidio: fix comment
  lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf
  rapidio: update for destination ID allocation
  rapidio: update asynchronous discovery initialization
  rapidio: use msleep in discovery wait
  mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip()
  arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups
  arch/powerpc/platforms/pseries/hotplug-memory.c: fix section handling code

1 files changed, 6 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index dc0a035e63bb..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,9 +100,9 @@ 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;
-                ret = __remove_pages(zone, start_pfn,  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;
         }