git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Add generic driver for Bluetooth SDIO devices
[pandora-kernel.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index
7ff0a81
..
f071648
100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-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).
*
/*
* 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).
/*
* 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;
}
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
/*
* Free all of a swapdev's extent information