diff options
| author | Michal Schmidt <xschmi00@stud.feec.vutbr.cz> | 2005-09-03 15:57:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:06:17 -0700 |
| commit | 56057e1a128a9aab516350500e5b154e70577929 (patch) | |
| tree | 68f323a6e919d96dad59471decb3bea3ec6a36fc /kernel/power | |
| parent | 46dacba52a19d1414ba249499a48382c16242d99 (diff) | |
| download | op-kernel-dev-56057e1a128a9aab516350500e5b154e70577929.zip op-kernel-dev-56057e1a128a9aab516350500e5b154e70577929.tar.gz | |
[PATCH] swsusp: simpler calculation of number of pages in PBE list
The function calc_nr uses an iterative algorithm to calculate the number of
pages needed for the image and the pagedir. Exactly the same result can be
obtained with a one-line expression.
Note that this was even proved correct ;-).
Signed-off-by: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/swsusp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index b041cea..1681e8a 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c @@ -737,18 +737,7 @@ static void copy_data_pages(void) static int calc_nr(int nr_copy) { - int extra = 0; - int mod = !!(nr_copy % PBES_PER_PAGE); - int diff = (nr_copy / PBES_PER_PAGE) + mod; - - do { - extra += diff; - nr_copy += diff; - mod = !!(nr_copy % PBES_PER_PAGE); - diff = (nr_copy / PBES_PER_PAGE) + mod - extra; - } while (diff > 0); - - return nr_copy; + return nr_copy + (nr_copy+PBES_PER_PAGE-2)/(PBES_PER_PAGE-1); } /** |
