summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/fpu
diff options
context:
space:
mode:
authorIngo Molnar2016-11-01 07:47:40 +0100
committerIngo Molnar2016-11-01 07:47:40 +0100
commitc29c716662d0cefc0cda4903aea5ed6794174679 (patch)
tree01d4dc47933e1bcbeca8d53b0cf5c1f70da04535 /arch/x86/kernel/fpu
parentx86/fpu: Finish excising 'eagerfpu' (diff)
parentfork: Add task stack refcounting sanity check and prevent premature task stac... (diff)
downloadkernel-qcow2-linux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.gz
kernel-qcow2-linux-c29c716662d0cefc0cda4903aea5ed6794174679.tar.xz
kernel-qcow2-linux-c29c716662d0cefc0cda4903aea5ed6794174679.zip
Merge branch 'core/urgent' into x86/fpu, to merge fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/fpu')
-rw-r--r--arch/x86/kernel/fpu/xstate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
index 17ad31fd0a9f..c7c11cc988b7 100644
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -74,6 +74,8 @@ void fpu__xstate_clear_all_cpu_caps(void)
setup_clear_cpu_cap(X86_FEATURE_MPX);
setup_clear_cpu_cap(X86_FEATURE_XGETBV1);
setup_clear_cpu_cap(X86_FEATURE_PKU);
+ setup_clear_cpu_cap(X86_FEATURE_AVX512_4VNNIW);
+ setup_clear_cpu_cap(X86_FEATURE_AVX512_4FMAPS);
}
/*