1 files changed, 4 insertions, 2 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 8c6b3ce38f09..d537d29e9b7b 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -31,6 +31,7 @@
 #include <linux/syscalls.h>
 #include <linux/memcontrol.h>
 #include <linux/poll.h>
+#include <linux/oom.h>
 
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
@@ -1555,6 +1556,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         struct address_space *mapping;
         struct inode *inode;
         char *pathname;
+        int oom_score_adj;
         int i, type, prev;
         int err;
 
@@ -1613,9 +1615,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         p->flags &= ~SWP_WRITEOK;
         spin_unlock(&swap_lock);
 
-        current->flags |= PF_OOM_ORIGIN;
+        oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
         err = try_to_unuse(type);
-        current->flags &= ~PF_OOM_ORIGIN;
+        test_set_oom_score_adj(oom_score_adj);
 
         if (err) {
                 /*