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 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index
32313f3
..
b1cd120
100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-1616,7
+1616,7
@@
SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
err = try_to_unuse(type);
-
test_set_oom_score_adj(
oom_score_adj);
+
compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX,
oom_score_adj);
if (err) {
/*