Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 7f1bf93fa87f8dcd380b2c8995fe2265f71d67d9..9deb93decc9ab8db987cd60c1b51ed956649baa9 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1205,7 +1205,7 @@ int is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages)
 }
 
 /*
 }
 
 /*

- * Confirm all pages in a range [start, end) is belongs to the same zone.
+ * Confirm all pages in a range [start, end) belong to the same zone.

  */
 static int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn)
 {
  */
 static int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn)
 {


@@ -1213,9 +1213,9 @@ static int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn)
        struct zone *zone = NULL;
        struct page *page;
        int i;
        struct zone *zone = NULL;
        struct page *page;
        int i;

-       for (pfn = start_pfn, sec_end_pfn = SECTION_ALIGN_UP(start_pfn);
+       for (pfn = start_pfn, sec_end_pfn = SECTION_ALIGN_UP(start_pfn + 1);

             pfn < end_pfn;
             pfn < end_pfn;

-            pfn = sec_end_pfn + 1, sec_end_pfn += PAGES_PER_SECTION) {
+            pfn = sec_end_pfn, sec_end_pfn += PAGES_PER_SECTION) {

                /* Make sure the memory section is present first */
                if (!present_section_nr(pfn_to_section_nr(pfn)))
                        continue;
                /* Make sure the memory section is present first */
                if (!present_section_nr(pfn_to_section_nr(pfn)))
                        continue;


@@ -1234,7 +1234,11 @@ static int test_pages_in_a_zone(unsigned long start_pfn, unsigned long end_pfn)
                        zone = page_zone(page);
                }
        }
                        zone = page_zone(page);
                }
        }

-       return 1;
+
+       if (zone)
+               return 1;
+       else
+               return 0;

 }
 
 /*
 }
 
 /*