projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
swapfile.c
diff --git
a/mm/swapfile.c
b/mm/swapfile.c
index 74f1102e8749a8b207aab5ae78fa4000ab0c5ca9..f1bf19daadc67143b099518c1bc29aa52ae04227 100644
(file)
--- a/
mm/swapfile.c
+++ b/
mm/swapfile.c
@@
-1575,9
+1575,9
@@
SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
p->flags &= ~SWP_WRITEOK;
spin_unlock(&swap_lock);
p->flags &= ~SWP_WRITEOK;
spin_unlock(&swap_lock);
- current->flags |= PF_
SWAPOFF
;
+ current->flags |= PF_
OOM_ORIGIN
;
err = try_to_unuse(type);
err = try_to_unuse(type);
- current->flags &= ~PF_
SWAPOFF
;
+ current->flags &= ~PF_
OOM_ORIGIN
;
if (err) {
/* re-insert swap space back into swap_list */
if (err) {
/* re-insert swap space back into swap_list */