lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 072/208] x86/fpu: Move xsave.h to fpu/xsave.h
    Date
    Move the xsave.h header file to the FPU directory as well.

    Reviewed-by: Borislav Petkov <bp@alien8.de>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/crypto/camellia_aesni_avx2_glue.c | 2 +-
    arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +-
    arch/x86/crypto/cast5_avx_glue.c | 2 +-
    arch/x86/crypto/cast6_avx_glue.c | 2 +-
    arch/x86/crypto/serpent_avx2_glue.c | 2 +-
    arch/x86/crypto/serpent_avx_glue.c | 2 +-
    arch/x86/crypto/sha-mb/sha1_mb.c | 2 +-
    arch/x86/crypto/sha1_ssse3_glue.c | 2 +-
    arch/x86/crypto/sha256_ssse3_glue.c | 2 +-
    arch/x86/crypto/sha512_ssse3_glue.c | 2 +-
    arch/x86/crypto/twofish_avx_glue.c | 2 +-
    arch/x86/include/asm/fpu-internal.h | 2 +-
    arch/x86/include/asm/{ => fpu}/xsave.h | 0
    arch/x86/kvm/cpuid.c | 2 +-
    14 files changed, 13 insertions(+), 13 deletions(-)

    diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c b/arch/x86/crypto/camellia_aesni_avx2_glue.c
    index baf0ac21ace5..004acd7bb4e0 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/xsave.h>
    +#include <asm/fpu/xsave.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 78818a1e73e3..2f7ead8caf53 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/xsave.h>
    +#include <asm/fpu/xsave.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 236c80974457..2c3360be6fc8 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/xsave.h>
    +#include <asm/fpu/xsave.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 f448810ca4ac..a2ec18a56e4f 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/xsave.h>
    +#include <asm/fpu/xsave.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 2f63dc89e7a9..206ec57725a3 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/xsave.h>
    +#include <asm/fpu/xsave.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 c8d478af8456..4feb68c9a41f 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/xsave.h>
    +#include <asm/fpu/xsave.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 15373786494f..02b64bbc1d48 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/xsave.h>
    +#include <asm/fpu/xsave.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 cb3bf19dca5a..71ab2b35d5e0 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/xsave.h>
    +#include <asm/fpu/xsave.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 9eaf7abaf4dc..dcbd8ea6eaaf 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/xsave.h>
    +#include <asm/fpu/xsave.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 e0d6a67f567d..e8836e0c1098 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/xsave.h>
    +#include <asm/fpu/xsave.h>

    #include <linux/string.h>

    diff --git a/arch/x86/crypto/twofish_avx_glue.c b/arch/x86/crypto/twofish_avx_glue.c
    index 1a66e6110f4b..3b6c8ba64f81 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/xsave.h>
    +#include <asm/fpu/xsave.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 d68b349b4247..20690a14c73a 100644
    --- a/arch/x86/include/asm/fpu-internal.h
    +++ b/arch/x86/include/asm/fpu-internal.h
    @@ -16,7 +16,7 @@

    #include <asm/user.h>
    #include <asm/fpu/api.h>
    -#include <asm/xsave.h>
    +#include <asm/fpu/xsave.h>

    #ifdef CONFIG_X86_64
    # include <asm/sigcontext32.h>
    diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/fpu/xsave.h
    similarity index 100%
    rename from arch/x86/include/asm/xsave.h
    rename to arch/x86/include/asm/fpu/xsave.h
    diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
    index 59b69f6a2844..0ce4c4f87332 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/xsave.h>
    +#include <asm/fpu/xsave.h>
    #include "cpuid.h"
    #include "lapic.h"
    #include "mmu.h"
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-05-05 19:21    [W:4.118 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site