dm-crypt: use __bio_add_page to add single page to clone bio

[linux-block.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 72cdb16e26366b17308b698abb7e91dcc12eb67d..339fee3eff6a2bb2f25d1663d91e17178302c03f 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2695,16 +2695,10 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                if (mmap_write_lock_killable(me->mm))
                        return -EINTR;
 
-               if (arg2) {
+               if (arg2)
                        error = ksm_enable_merge_any(me->mm);
-               } else {
-                       /*
-                        * TODO: we might want disable KSM on all VMAs and
-                        * trigger unsharing to completely disable KSM.
-                        */
-                       clear_bit(MMF_VM_MERGE_ANY, &me->mm->flags);
-                       error = 0;
-               }
+               else
+                       error = ksm_disable_merge_any(me->mm);
                mmap_write_unlock(me->mm);
                break;
        case PR_GET_MEMORY_MERGE: