From 4da49a0cf87a075566546b6fc6e022840495fc70 Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Wed, 22 Jul 2009 19:56:10 +0200 Subject: [PATCH] --- yaml --- r: 161349 b: refs/heads/master c: 8de0307326be94148436082a9abf365da8e3c66d h: refs/heads/master i: 161347: 3658872c9d90b27b3272d49df06bcb1163e24b81 v: v3 --- [refs] | 2 +- trunk/kernel/power/snapshot.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fbfdeee21092..e5394b2ed538 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98e73dc5d2dadfcb95305ad71ac9239f4e361870 +refs/heads/master: 8de0307326be94148436082a9abf365da8e3c66d diff --git a/trunk/kernel/power/snapshot.c b/trunk/kernel/power/snapshot.c index bf06658f2052..97955b0e44f4 100644 --- a/trunk/kernel/power/snapshot.c +++ b/trunk/kernel/power/snapshot.c @@ -233,7 +233,7 @@ static void *chain_alloc(struct chain_allocator *ca, unsigned int size) #define BM_END_OF_MAP (~0UL) -#define BM_BITS_PER_BLOCK (PAGE_SIZE << 3) +#define BM_BITS_PER_BLOCK (PAGE_SIZE * BITS_PER_BYTE) struct bm_block { struct list_head hook; /* hook into a list of bitmap blocks */ @@ -275,7 +275,7 @@ static void memory_bm_free(struct memory_bitmap *bm, int clear_nosave_free); /** * create_bm_block_list - create a list of block bitmap objects - * @nr_blocks - number of blocks to allocate + * @pages - number of pages to track * @list - list to put the allocated blocks into * @ca - chain allocator to be used for allocating memory */