Move swap allocation routines from swsusp.c to swap.c, so that all of
the swap related stuff really is in swap.c.
Signed-off-by: Nigel Cunningham <[email protected]>
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index fc713d5..89b3d14 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -46,6 +46,33 @@ static struct swsusp_header {
static unsigned short root_swap = 0xffff;
+unsigned long alloc_swap_page(int swap, struct extent_chain *extents)
+{
+ swp_entry_t entry = get_swap_page_of_type(swap);
+ if (entry.val) {
+ unsigned long new_value = swap_entry_to_extent_val(entry);
+ suspend_add_to_extent_chain(extents, new_value, new_value);
+ }
+ return swp_offset(entry);
+}
+
+void free_all_swap_pages(int swap, struct extent_chain *extents)
+{
+ if (extents->first) {
+ /* Free swap entries */
+ struct extent *extentpointer;
+ unsigned long extentvalue;
+ swp_entry_t entry;
+ suspend_extent_for_each(extents, extentpointer,
+ extentvalue) {
+ entry = extent_val_to_swap_entry(extentvalue);
+ swap_free(entry);
+ }
+
+ suspend_put_extent_chain(extents);
+ }
+}
+
static int mark_swapfiles(swp_entry_t start)
{
int error;
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index aa8205c..7bed461 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -73,33 +73,6 @@ static inline int restore_highmem(void)
static inline unsigned int count_highmem_pages(void) { return 0; }
#endif
-unsigned long alloc_swap_page(int swap, struct extent_chain *extents)
-{
- swp_entry_t entry = get_swap_page_of_type(swap);
- if (entry.val) {
- unsigned long new_value = swap_entry_to_extent_val(entry);
- suspend_add_to_extent_chain(extents, new_value, new_value);
- }
- return swp_offset(entry);
-}
-
-void free_all_swap_pages(int swap, struct extent_chain *extents)
-{
- if (extents->first) {
- /* Free swap entries */
- struct extent *extentpointer;
- unsigned long extentvalue;
- swp_entry_t entry;
- suspend_extent_for_each(extents, extentpointer,
- extentvalue) {
- entry = extent_val_to_swap_entry(extentvalue);
- swap_free(entry);
- }
-
- suspend_put_extent_chain(extents);
- }
-}
-
/**
* swsusp_shrink_memory - Try to free as much memory as needed
*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
