diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-01-05 16:36:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-05 23:55:22 -0800 |
| commit | 7bf236874292fd073c6bdd27f89c3d9e81a79cbc (patch) | |
| tree | 27e4196e4b720c113010d544567f76f181c11428 /include/linux/swap.h | |
| parent | 3223ea8cca5936b8e78450dd5b8ba88372e9c0a8 (diff) | |
| download | linux-7bf236874292fd073c6bdd27f89c3d9e81a79cbc.tar.gz linux-7bf236874292fd073c6bdd27f89c3d9e81a79cbc.tar.bz2 linux-7bf236874292fd073c6bdd27f89c3d9e81a79cbc.zip | |
[PATCH] swsusp: Do not fail if resume device is not set
In the kernels later than 2.6.19 there is a regression that makes swsusp
fail if the resume device is not explicitly specified.
It can be fixed by adding an additional parameter to
mm/swapfile.c:swap_type_of() allowing us to pass the (struct block_device
*) corresponding to the first available swap back to the caller.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/swap.h')
| -rw-r--r-- | include/linux/swap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index add51cebc8d9..5423559a44a6 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -245,7 +245,7 @@ extern int swap_duplicate(swp_entry_t); extern int valid_swaphandles(swp_entry_t, unsigned long *); extern void swap_free(swp_entry_t); extern void free_swap_and_cache(swp_entry_t); -extern int swap_type_of(dev_t, sector_t); +extern int swap_type_of(dev_t, sector_t, struct block_device **); extern unsigned int count_swap_pages(int, int); extern sector_t map_swap_page(struct swap_info_struct *, pgoff_t); extern sector_t swapdev_block(int, pgoff_t); |