diff options
author | Marc Zyngier <maz@kernel.org> | 2022-05-04 09:38:32 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2022-05-04 09:38:32 +0100 |
commit | 4b88524c47d7bffd5aaabf918c7759c74a1c577b (patch) | |
tree | b1cca2cdf82acd5a25305ed2aa00290b6ccc6a42 /kernel | |
parent | 672c0c5173427e6b3e2a9bbb7be51ceeec78093a (diff) | |
parent | 2e29b9971ac54dec88baa58856a230ec2f2a2dff (diff) | |
download | linux-stable-4b88524c47d7bffd5aaabf918c7759c74a1c577b.tar.gz linux-stable-4b88524c47d7bffd5aaabf918c7759c74a1c577b.tar.bz2 linux-stable-4b88524c47d7bffd5aaabf918c7759c74a1c577b.zip |
Merge remote-tracking branch 'arm64/for-next/sme' into kvmarm-master/next
Merge arm64's SME branch to resolve conflicts with the WFxT branch.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sys.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 374f83e95239..b911fa6d81ab 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -117,6 +117,12 @@ #ifndef SVE_GET_VL # define SVE_GET_VL() (-EINVAL) #endif +#ifndef SME_SET_VL +# define SME_SET_VL(a) (-EINVAL) +#endif +#ifndef SME_GET_VL +# define SME_GET_VL() (-EINVAL) +#endif #ifndef PAC_RESET_KEYS # define PAC_RESET_KEYS(a, b) (-EINVAL) #endif @@ -2541,6 +2547,12 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, case PR_SVE_GET_VL: error = SVE_GET_VL(); break; + case PR_SME_SET_VL: + error = SME_SET_VL(arg2); + break; + case PR_SME_GET_VL: + error = SME_GET_VL(); + break; case PR_GET_SPECULATION_CTRL: if (arg3 || arg4 || arg5) return -EINVAL; |