| commit | 2241aa98c9aa6b5b5fec1a0ce4af9efb0d9eacdc | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@google.com> | Tue Jul 31 20:28:27 2018 +0200 |
| committer | Greg Kroah-Hartman <gregkh@google.com> | Tue Jul 31 20:28:27 2018 +0200 |
| tree | b61981dc67f3145d613e49db53e32b220e4b2179 | |
| 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>
diff --git a/kernel/sys.c b/kernel/sys.c index 3195435..0df4753 100644 --- a/kernel/sys.c +++ b/kernel/sys.c
@@ -2455,6 +2455,7 @@ 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;