diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2011-02-25 14:44:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 15:07:37 -0800 |
| commit | 29723fccc837d20039078f7a571e8d457eb0d6c6 (patch) | |
| tree | f11e37b20388eb12f04ae8718b247e931ce99379 /mm | |
| parent | a2d6d2fa90c0e1d2cc1d59ccb5bbe93bb28b7413 (diff) | |
| download | kernel-common-29723fccc837d20039078f7a571e8d457eb0d6c6.tar.gz kernel-common-29723fccc837d20039078f7a571e8d457eb0d6c6.tar.bz2 kernel-common-29723fccc837d20039078f7a571e8d457eb0d6c6.zip | |
mm: fix dubious code in __count_immobile_pages()
When pfn_valid_within() failed 'iter' was incremented twice.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -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) for (found = 0, iter = 0; iter < pageblock_nr_pages; iter++) { unsigned long check = pfn + iter; - if (!pfn_valid_within(check)) { - iter++; + if (!pfn_valid_within(check)) continue; - } + page = pfn_to_page(check); if (!page_count(page)) { if (PageBuddy(page)) |