manual merge of x86/fpu

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c
index bacaa13acac544e037571bd292e91f5239256edc,12e729bfe71b7b1f744972e48295989f41932d70..6ce3b7fc770ba8bc8f87cd999716e0acc6f97af2
--- 1/arch/x86/crypto/camellia_aesni_avx_glue.c
--- 2/arch/x86/crypto/camellia_aesni_avx_glue.c
+++ b/arch/x86/crypto/camellia_aesni_avx_glue.c
@@@ -554,12 -554,8 +554,12 @@@ static int __init camellia_aesni_init(v
  {
        const char *feature_name;
  
 -      if (!cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM,
 -                              &feature_name)) {
 +      if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) {
 +              pr_info("AVX or AES-NI instructions are not detected.\n");
 +              return -ENODEV;
 +      }
 +
-       if (!cpu_has_xfeatures(XSTATE_SSE | XSTATE_YMM, &feature_name)) {
++      if (!cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, &feature_name)) {
                pr_info("CPU feature '%s' is not supported.\n", feature_name);
                return -ENODEV;
        }

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc tools/testing/selftests/x86/Makefile
index 389701f599406bffa76980d98f27a0cb913ac1d5,7145b3d9030ca62422633c8023451bdc557f8c53..eabcff4119840aaf663da3bbd0a8c4154b072881
--- 1/tools/testing/selftests/x86/Makefile
--- 2/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@@ -4,8 -4,9 +4,9 @@@ include ../lib.m
  
  .PHONY: all all_32 all_64 warn_32bit_failure clean
  
 -TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs ldt_gdt syscall_nt
 -TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault sigreturn \
 +TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs ldt_gdt syscall_nt ptrace_syscall
- TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault sigreturn test_syscall_vdso unwind_vdso
++TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault sigreturn test_syscall_vdso unwind_vdso \
+                       test_FCMOV test_FCOMI test_FISTTP
  
  TARGETS_C_32BIT_ALL := $(TARGETS_C_BOTHBITS) $(TARGETS_C_32BIT_ONLY)
  BINARIES_32 := $(TARGETS_C_32BIT_ALL:%=%_32)