diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2018-07-31 20:28:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-07-31 20:28:27 +0200 |
| commit | 2241aa98c9aa6b5b5fec1a0ce4af9efb0d9eacdc (patch) | |
| tree | b61981dc67f3145d613e49db53e32b220e4b2179 /kernel/sys.c | |
| parent | 05670d3d98f96844679f61cad014f74e85446999 (diff) | |
kernel/sys.c: fix merge error with 4.4.144
Change-Id: I7b3b8c82b81f465e47a653c71e7d945cd1cd990d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 3195435462a6..0df4753d4969 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2455,6 +2455,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, break; case PR_SET_VMA: error = prctl_set_vma(arg2, arg3, arg4, arg5); + break; case PR_GET_SPECULATION_CTRL: if (arg3 || arg4 || arg5) return -EINVAL; |