forked from luck/tmp_suning_uos_patched
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: Fix free_unnecessary_pages()
This commit is contained in:
commit
31cb852809
@ -1211,7 +1211,11 @@ static void free_unnecessary_pages(void)
|
|||||||
to_free_highmem = alloc_highmem - save;
|
to_free_highmem = alloc_highmem - save;
|
||||||
} else {
|
} else {
|
||||||
to_free_highmem = 0;
|
to_free_highmem = 0;
|
||||||
to_free_normal -= save - alloc_highmem;
|
save -= alloc_highmem;
|
||||||
|
if (to_free_normal > save)
|
||||||
|
to_free_normal -= save;
|
||||||
|
else
|
||||||
|
to_free_normal = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
memory_bm_position_reset(©_bm);
|
memory_bm_position_reset(©_bm);
|
||||||
|
Loading…
Reference in New Issue
Block a user