From c4552dd1dcb6dc3b74ff879be5e49f717f7a1836 Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Sat, 20 Oct 2007 02:26:04 +0200 Subject: [PATCH] --- yaml --- r: 71877 b: refs/heads/master c: df7c487250b17aa0caeee7d85f120330f1d31355 h: refs/heads/master i: 71875: f26cc51ac9e1b4d755bef1c426e7187471137140 v: v3 --- [refs] | 2 +- trunk/kernel/power/snapshot.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3113cec12cbc..34c2fb1d39d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 963151297328eea39933bda23959ce5319e99fb7 +refs/heads/master: df7c487250b17aa0caeee7d85f120330f1d31355 diff --git a/trunk/kernel/power/snapshot.c b/trunk/kernel/power/snapshot.c index ccc95ac07bed..78039b477d2b 100644 --- a/trunk/kernel/power/snapshot.c +++ b/trunk/kernel/power/snapshot.c @@ -1005,11 +1005,12 @@ copy_data_pages(struct memory_bitmap *copy_bm, struct memory_bitmap *orig_bm) } memory_bm_position_reset(orig_bm); memory_bm_position_reset(copy_bm); - do { + for(;;) { pfn = memory_bm_next_pfn(orig_bm); - if (likely(pfn != BM_END_OF_MAP)) - copy_data_page(memory_bm_next_pfn(copy_bm), pfn); - } while (pfn != BM_END_OF_MAP); + if (unlikely(pfn == BM_END_OF_MAP)) + break; + copy_data_page(memory_bm_next_pfn(copy_bm), pfn); + } } /* Total number of image pages */