diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-17 14:14:12 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-17 14:14:12 -0400 |
| commit | 325d1605542960903c88409b199734a3d8fc6612 (patch) | |
| tree | 9d8eeed393a3b5dcadd1ddb6b76634b464fd6bc7 /mm/page_alloc.c | |
| parent | 3c5ead52ed68406c0ee789024c4ae581be8bcee4 (diff) | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 a873e61e312e..cdef1d4b4e47 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)) |