diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
| commit | 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (patch) | |
| tree | 65a01a1e0bc0e28c64fb5105cc763949f5412b4b /mm/page_alloc.c | |
| parent | dd87cc53c42f3260b7eb7f60822de0fa9e58af59 (diff) | |
| parent | 589c7a39ae2f2b74fd13ae344ca1dcca61da6bca (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a873e61e312..cdef1d4b4e4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -5376,10 +5376,9 @@ __count_immobile_pages(struct zone *zone, struct page *page, int count) | |||
| 5376 | for (found = 0, iter = 0; iter < pageblock_nr_pages; iter++) { | 5376 | for (found = 0, iter = 0; iter < pageblock_nr_pages; iter++) { |
| 5377 | unsigned long check = pfn + iter; | 5377 | unsigned long check = pfn + iter; |
| 5378 | 5378 | ||
| 5379 | if (!pfn_valid_within(check)) { | 5379 | if (!pfn_valid_within(check)) |
| 5380 | iter++; | ||
| 5381 | continue; | 5380 | continue; |
| 5382 | } | 5381 | |
| 5383 | page = pfn_to_page(check); | 5382 | page = pfn_to_page(check); |
| 5384 | if (!page_count(page)) { | 5383 | if (!page_count(page)) { |
| 5385 | if (PageBuddy(page)) | 5384 | if (PageBuddy(page)) |