fix a braino in compat_sys_getrlimit()

[sfrench/cifs-2.6.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 47d901586b4e0ac5185ba256a720098ad11c96f7..2855ee73acd0ef9f62699ff669659e045df84422 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1362,7 +1362,7 @@ COMPAT_SYSCALL_DEFINE2(getrlimit, unsigned int, resource,
 
        ret = do_prlimit(current, resource, NULL, &r);
        if (!ret) {
-               struct rlimit r32;
+               struct compat_rlimit r32;
                if (r.rlim_cur > COMPAT_RLIM_INFINITY)
                        r32.rlim_cur = COMPAT_RLIM_INFINITY;
                else
@@ -2360,7 +2360,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
        case PR_GET_THP_DISABLE:
                if (arg2 || arg3 || arg4 || arg5)
                        return -EINVAL;
-               error = !!(me->mm->def_flags & VM_NOHUGEPAGE);
+               error = !!test_bit(MMF_DISABLE_THP, &me->mm->flags);
                break;
        case PR_SET_THP_DISABLE:
                if (arg3 || arg4 || arg5)
@@ -2368,9 +2368,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                if (down_write_killable(&me->mm->mmap_sem))
                        return -EINTR;
                if (arg2)
-                       me->mm->def_flags |= VM_NOHUGEPAGE;
+                       set_bit(MMF_DISABLE_THP, &me->mm->flags);
                else
-                       me->mm->def_flags &= ~VM_NOHUGEPAGE;
+                       clear_bit(MMF_DISABLE_THP, &me->mm->flags);
                up_write(&me->mm->mmap_sem);
                break;
        case PR_MPX_ENABLE_MANAGEMENT: