projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[cascardo/linux.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index
63f55cc
..
a7e7210
100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-1312,7
+1312,7
@@
static unsigned int find_next_to_unuse(struct swap_info_struct *si,
else
continue;
}
- count =
ACCESS
_ONCE(si->swap_map[i]);
+ count =
READ
_ONCE(si->swap_map[i]);
if (count && swap_count(count) != SWAP_MAP_BAD)
break;
}