diff options
Diffstat (limited to 'kernel/power/swsusp.c')
-rw-r--r-- | kernel/power/swsusp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index 0b66659dc516..4147a756a8c7 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c | |||
@@ -134,18 +134,18 @@ static int bitmap_set(struct bitmap_page *bitmap, unsigned long bit) | |||
134 | return 0; | 134 | return 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | unsigned long alloc_swap_page(int swap, struct bitmap_page *bitmap) | 137 | sector_t alloc_swapdev_block(int swap, struct bitmap_page *bitmap) |
138 | { | 138 | { |
139 | unsigned long offset; | 139 | unsigned long offset; |
140 | 140 | ||
141 | offset = swp_offset(get_swap_page_of_type(swap)); | 141 | offset = swp_offset(get_swap_page_of_type(swap)); |
142 | if (offset) { | 142 | if (offset) { |
143 | if (bitmap_set(bitmap, offset)) { | 143 | if (bitmap_set(bitmap, offset)) |
144 | swap_free(swp_entry(swap, offset)); | 144 | swap_free(swp_entry(swap, offset)); |
145 | offset = 0; | 145 | else |
146 | } | 146 | return swapdev_block(swap, offset); |
147 | } | 147 | } |
148 | return offset; | 148 | return 0; |
149 | } | 149 | } |
150 | 150 | ||
151 | void free_all_swap_pages(int swap, struct bitmap_page *bitmap) | 151 | void free_all_swap_pages(int swap, struct bitmap_page *bitmap) |