diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-03-28 12:44:26 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-03-28 12:44:26 -0400 |
| commit | 99bdc3880c611c7f2061fbd5372ef81b40217e26 (patch) | |
| tree | ef68a53e28e9ee53ce9db3642bab5fa5b3d44866 /mm/page_alloc.c | |
| parent | ed59992e8d91b70053c53d846a76f7e1ac000454 (diff) | |
| parent | b4e1b7e88b2c87c358c2a88bec0c76d25accc604 (diff) | |
Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix
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)) |