diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c b/arch/x86/crypto/camellia_aesni_avx2_glue.c index 004acd7bb4e01a3cd519d45081acfa90b8d2a719..46484482f2670c180f501b802121b1fdc8a2926c 100644 --- a/arch/x86/crypto/camellia_aesni_avx2_glue.c +++ b/arch/x86/crypto/camellia_aesni_avx2_glue.c @@ -20,7 +20,7 @@ #include <crypto/lrw.h> #include <crypto/xts.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <asm/crypto/camellia.h> #include <asm/crypto/glue_helper.h> diff --git a/arch/x86/crypto/camellia_aesni_avx_glue.c b/arch/x86/crypto/camellia_aesni_avx_glue.c index 2f7ead8caf535a18ca341454dacb765ad54fea9e..0122cd95563a0aa4745a55f7cbe85ed3060f7880 100644 --- a/arch/x86/crypto/camellia_aesni_avx_glue.c +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c @@ -20,7 +20,7 @@ #include <crypto/lrw.h> #include <crypto/xts.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <asm/crypto/camellia.h> #include <asm/crypto/glue_helper.h> diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c index 2c3360be6fc8464db864bb293cba60ac06a142ae..ca4f32e7a4233b9f06d394b5cd93e45dbc6a92a5 100644 --- a/arch/x86/crypto/cast5_avx_glue.c +++ b/arch/x86/crypto/cast5_avx_glue.c @@ -32,7 +32,7 @@ #include <crypto/cryptd.h> #include <crypto/ctr.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <asm/crypto/glue_helper.h> #define CAST5_PARALLEL_BLOCKS 16 diff --git a/arch/x86/crypto/cast6_avx_glue.c b/arch/x86/crypto/cast6_avx_glue.c index a2ec18a56e4f99fd59dd67670d262ce53de3846b..21d0b845c8c423c9d235a0013361a68455d6dfe3 100644 --- a/arch/x86/crypto/cast6_avx_glue.c +++ b/arch/x86/crypto/cast6_avx_glue.c @@ -37,7 +37,7 @@ #include <crypto/lrw.h> #include <crypto/xts.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <asm/crypto/glue_helper.h> #define CAST6_PARALLEL_BLOCKS 8 diff --git a/arch/x86/crypto/serpent_avx2_glue.c b/arch/x86/crypto/serpent_avx2_glue.c index 206ec57725a3582124b72fa68eb3e0b294a05163..aa325fa5c7a68d08efbec463cd413f4d60e80bea 100644 --- a/arch/x86/crypto/serpent_avx2_glue.c +++ b/arch/x86/crypto/serpent_avx2_glue.c @@ -21,7 +21,7 @@ #include <crypto/xts.h> #include <crypto/serpent.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <asm/crypto/serpent-avx.h> #include <asm/crypto/glue_helper.h> diff --git a/arch/x86/crypto/serpent_avx_glue.c b/arch/x86/crypto/serpent_avx_glue.c index 4feb68c9a41fb3a2580b71bbcfbc0951c7d7776f..f66ae85f58feae79ae08ed16ec40d3705c9ed504 100644 --- a/arch/x86/crypto/serpent_avx_glue.c +++ b/arch/x86/crypto/serpent_avx_glue.c @@ -37,7 +37,7 @@ #include <crypto/lrw.h> #include <crypto/xts.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <asm/crypto/serpent-avx.h> #include <asm/crypto/glue_helper.h> diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c index 03ffaf8c22442d5c7d94ea58c39aaae1854fe2de..6f3f76568bd572339fb5f556a8c18d43951c95f4 100644 --- a/arch/x86/crypto/sha-mb/sha1_mb.c +++ b/arch/x86/crypto/sha-mb/sha1_mb.c @@ -66,7 +66,7 @@ #include <crypto/crypto_wq.h> #include <asm/byteorder.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <linux/hardirq.h> #include <asm/fpu/internal.h> #include "sha_mb_ctx.h" diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c index 71ab2b35d5e0fac32017ba7ec96d834765f237cc..84db12f052e84895fb262ff7409108dbcf853b05 100644 --- a/arch/x86/crypto/sha1_ssse3_glue.c +++ b/arch/x86/crypto/sha1_ssse3_glue.c @@ -31,7 +31,7 @@ #include <crypto/sha1_base.h> #include <asm/fpu/api.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> asmlinkage void sha1_transform_ssse3(u32 *digest, const char *data, diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c index dcbd8ea6eaaf3bf521442445e4d1181d209cc2db..eb65522f02b891ff8516012c62ed200a0b0282c2 100644 --- a/arch/x86/crypto/sha256_ssse3_glue.c +++ b/arch/x86/crypto/sha256_ssse3_glue.c @@ -39,7 +39,7 @@ #include <crypto/sha256_base.h> #include <asm/fpu/api.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <linux/string.h> asmlinkage void sha256_transform_ssse3(u32 *digest, const char *data, diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c index e8836e0c10988e2d272b3de3014af591fbae15aa..78914641c72b20eda6b803d9549f3eb6de4a4867 100644 --- a/arch/x86/crypto/sha512_ssse3_glue.c +++ b/arch/x86/crypto/sha512_ssse3_glue.c @@ -37,7 +37,7 @@ #include <crypto/sha512_base.h> #include <asm/fpu/api.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <linux/string.h> diff --git a/arch/x86/crypto/twofish_avx_glue.c b/arch/x86/crypto/twofish_avx_glue.c index 3b6c8ba64f816495b66c5649316ef89890be77d1..95434f5b705a23ecbc2b67831b9c2a12643ebee0 100644 --- a/arch/x86/crypto/twofish_avx_glue.c +++ b/arch/x86/crypto/twofish_avx_glue.c @@ -38,7 +38,7 @@ #include <crypto/xts.h> #include <asm/fpu/api.h> #include <asm/xcr.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include <asm/crypto/twofish.h> #include <asm/crypto/glue_helper.h> #include <crypto/scatterwalk.h> diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h index 28556c6671c31c9666c13724253b6b2bbcec62a7..8ec785ecce8114977c28a13f25b57fba2eb7a7e4 100644 --- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -17,7 +17,7 @@ #include <asm/user.h> #include <asm/fpu/api.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #ifdef CONFIG_X86_64 # include <asm/sigcontext32.h> diff --git a/arch/x86/include/asm/fpu/xsave.h b/arch/x86/include/asm/fpu/xstate.h similarity index 100% rename from arch/x86/include/asm/fpu/xsave.h rename to arch/x86/include/asm/fpu/xstate.h diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 0ce4c4f87332621b063116d1c6d3ba5556915979..2426e6530d3c75c68bd4757f4e3aa81f146eba6d 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -17,7 +17,7 @@ #include <linux/vmalloc.h> #include <linux/uaccess.h> #include <asm/user.h> -#include <asm/fpu/xsave.h> +#include <asm/fpu/xstate.h> #include "cpuid.h" #include "lapic.h" #include "mmu.h"