diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 04:06:36 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 04:06:36 -0500 |
| commit | fab8d6ddf6dee2608869005d45fe97f70e4f5bdd (patch) | |
| tree | fecf566e03a87b2a44c7f3363ddb5c0d4bebdca7 /kernel/power/snapshot.c | |
| parent | 64419d93a5906600af5817ad0cae3c6ecf7fb389 (diff) | |
| parent | f52ee1410d563cd409b08822492273a5bc235821 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'kernel/power/snapshot.c')
| -rw-r--r-- | kernel/power/snapshot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 41f66365f0d8..8d5a5986d621 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
| @@ -91,10 +91,8 @@ static int save_highmem_zone(struct zone *zone) | |||
| 91 | * corrected eventually when the cases giving rise to this | 91 | * corrected eventually when the cases giving rise to this |
| 92 | * are better understood. | 92 | * are better understood. |
| 93 | */ | 93 | */ |
| 94 | if (PageReserved(page)) { | 94 | if (PageReserved(page)) |
| 95 | printk("highmem reserved page?!\n"); | ||
| 96 | continue; | 95 | continue; |
| 97 | } | ||
| 98 | BUG_ON(PageNosave(page)); | 96 | BUG_ON(PageNosave(page)); |
| 99 | if (PageNosaveFree(page)) | 97 | if (PageNosaveFree(page)) |
| 100 | continue; | 98 | continue; |
