diff options
| author | Colin Cross <ccross@android.com> | 2013-10-30 13:14:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-11-07 16:25:11 -0800 |
| commit | 527aae529118f2cbe99c945ffe74be1c04ceaba6 (patch) | |
| tree | 45e999810bb530ee7030a60f266929141ab7d716 /kernel/sys.c | |
| parent | 7fbddfd1dab3e7c64e88939d796cf60ea1dde8a2 (diff) | |
| download | olio-linux-3.10-527aae529118f2cbe99c945ffe74be1c04ceaba6.tar.xz olio-linux-3.10-527aae529118f2cbe99c945ffe74be1c04ceaba6.zip | |
mm: fix anon vma naming
Fix two bugs caused by merging anon vma_naming, a typo in
mempolicy.c and a bad merge in sys.c.
Change-Id: Ia4ced447d50573e68195e95ea2f2b4d9456b8a90
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 1c9090bc674..3dcf1de0eb7 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2368,9 +2368,6 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, else return -EINVAL; break; - case PR_SET_VMA: - error = prctl_set_vma(arg2, arg3, arg4, arg5); - break; default: return -EINVAL; } @@ -2407,6 +2404,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, if (arg2 || arg3 || arg4 || arg5) return -EINVAL; return current->no_new_privs ? 1 : 0; + case PR_SET_VMA: + error = prctl_set_vma(arg2, arg3, arg4, arg5); + break; default: error = -EINVAL; break; |