iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION

Browse Source 
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION to avoid
confusion (among other things, with CONFIG_SUSPEND introduced in the
next patch).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Rafael J. Wysocki
2007-07-29 23:24:36 +02:00
committed by Linus Torvalds
parent 6c8dca5d53
commit b0cb1a19d0
33 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mm/swapfile.c
View File

@ -425,7 +425,7 @@ void free_swap_and_cache(swp_entry_t entry)
}
}
#ifdef CONFIG_SOFTWARE_SUSPEND
#ifdef CONFIG_HIBERNATION
/*
* Find the swap type that corresponds to given device (if any).
*
@ -951,7 +951,7 @@ sector_t map_swap_page(struct swap_info_struct *sis, pgoff_t offset)
}
}
#ifdef CONFIG_SOFTWARE_SUSPEND
#ifdef CONFIG_HIBERNATION
/*
* Get the (PAGE_SIZE) block corresponding to given offset on the swapdev
* corresponding to given index in swap_info (swap type).
@ -966,7 +966,7 @@ sector_t swapdev_block(int swap_type, pgoff_t offset)
sis = swap_info + swap_type;
return (sis->flags & SWP_WRITEOK) ? map_swap_page(sis, offset) : 0;
}
#endif /* CONFIG_SOFTWARE_SUSPEND */
#endif /* CONFIG_HIBERNATION */
/*
* Free all of a swapdev's extent information