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
include/linux/ioport.h: add missing macro argument for devm_release_* family
[pandora-kernel.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index
6beb625
..
1e330f2
100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-403,7
+403,7
@@
void free_swap_and_cache(swp_entry_t entry)
if (p) {
if (swap_entry_free(p, swp_offset(entry)) == 1) {
page = find_get_page(&swapper_space, entry.val);
if (p) {
if (swap_entry_free(p, swp_offset(entry)) == 1) {
page = find_get_page(&swapper_space, entry.val);
- if (page && unlikely(
TestSetPageLocked
(page))) {
+ if (page && unlikely(
!trylock_page
(page))) {
page_cache_release(page);
page = NULL;
}
page_cache_release(page);
page = NULL;
}
@@
-656,8
+656,8
@@
static int unuse_mm(struct mm_struct *mm,
if (!down_read_trylock(&mm->mmap_sem)) {
/*
if (!down_read_trylock(&mm->mmap_sem)) {
/*
- * Activate page so shrink_
cache is unlikely to unmap its
- * ptes while lock is dropped, so swapoff can make progress.
+ * Activate page so shrink_
inactive_list is unlikely to unmap
+ *
its
ptes while lock is dropped, so swapoff can make progress.
*/
activate_page(page);
unlock_page(page);
*/
activate_page(page);
unlock_page(page);