diff options
-rw-r--r-- | mm/memory_hotplug.c | 2 | ||||
-rw-r--r-- | mm/page_alloc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index e3097f299f67..6096cb918735 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -309,7 +309,7 @@ static int __meminit move_pfn_range_left(struct zone *z1, struct zone *z2, | |||
309 | /* can't move pfns which are higher than @z2 */ | 309 | /* can't move pfns which are higher than @z2 */ |
310 | if (end_pfn > zone_end_pfn(z2)) | 310 | if (end_pfn > zone_end_pfn(z2)) |
311 | goto out_fail; | 311 | goto out_fail; |
312 | /* the move out part mast at the left most of @z2 */ | 312 | /* the move out part must be at the left most of @z2 */ |
313 | if (start_pfn > z2->zone_start_pfn) | 313 | if (start_pfn > z2->zone_start_pfn) |
314 | goto out_fail; | 314 | goto out_fail; |
315 | /* must included/overlap */ | 315 | /* must included/overlap */ |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6780b2e18aa1..657daea88aa8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -2845,7 +2845,7 @@ EXPORT_SYMBOL(free_pages_exact); | |||
2845 | * nr_free_zone_pages() counts the number of counts pages which are beyond the | 2845 | * nr_free_zone_pages() counts the number of counts pages which are beyond the |
2846 | * high watermark within all zones at or below a given zone index. For each | 2846 | * high watermark within all zones at or below a given zone index. For each |
2847 | * zone, the number of pages is calculated as: | 2847 | * zone, the number of pages is calculated as: |
2848 | * present_pages - high_pages | 2848 | * managed_pages - high_pages |
2849 | */ | 2849 | */ |
2850 | static unsigned long nr_free_zone_pages(int offset) | 2850 | static unsigned long nr_free_zone_pages(int offset) |
2851 | { | 2851 | { |