projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.gitattributes: set git diff driver for C source code files
[cascardo/linux.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index
134c085
..
2210de2
100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-105,7
+105,7
@@
__try_to_reclaim_swap(struct swap_info_struct *si, unsigned long offset)
struct page *page;
int ret = 0;
struct page *page;
int ret = 0;
- page = find_get_page(swap_address_space(entry),
entry.val
);
+ page = find_get_page(swap_address_space(entry),
swp_offset(entry)
);
if (!page)
return 0;
/*
if (!page)
return 0;
/*
@@
-1005,7
+1005,7
@@
int free_swap_and_cache(swp_entry_t entry)
if (p) {
if (swap_entry_free(p, entry, 1) == SWAP_HAS_CACHE) {
page = find_get_page(swap_address_space(entry),
if (p) {
if (swap_entry_free(p, entry, 1) == SWAP_HAS_CACHE) {
page = find_get_page(swap_address_space(entry),
-
entry.val
);
+
swp_offset(entry)
);
if (page && !trylock_page(page)) {
put_page(page);
page = NULL;
if (page && !trylock_page(page)) {
put_page(page);
page = NULL;