sctp: Change defaults on cookie hmac selection

[linux.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 0fbb45283c6641cf1bdb8b5a39b4c9eb414f61f7..e97a0e5aea912cf0c0109164811d650cc0b2219e 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1498,7 +1498,6 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
        struct address_space *mapping;
        struct inode *inode;
        struct filename *pathname;
-       int oom_score_adj;
        int i, type, prev;
        int err;
 
@@ -1557,9 +1556,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
        p->flags &= ~SWP_WRITEOK;
        spin_unlock(&swap_lock);
 
-       oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
+       set_current_oom_origin();
        err = try_to_unuse(type, false, 0); /* force all pages to be unused */
-       compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX, oom_score_adj);
+       clear_current_oom_origin();
 
        if (err) {
                /* re-insert swap space back into swap_list */