summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2012-06-18 13:07:45 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2012-06-27 08:42:02 +0200
commitd4af0e9d6eef6ce53c1935ca6ee3c01889e3212d (patch)
tree5c9d83cb6b5a28fa11e32092cb4a3ec69da92ca8 /arch
parentcrypto: twofish-avx - remove duplicated glue code and use shared glue code fr... (diff)
downloadlinux-d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d.tar.xz
linux-d4af0e9d6eef6ce53c1935ca6ee3c01889e3212d.zip
crypto: move arch/x86/include/asm/serpent-{sse2|avx}.h to arch/x86/include/asm/crypto/
Move serpent crypto headers to the new asm/crypto/ directory. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/crypto/serpent_avx_glue.c2
-rw-r--r--arch/x86/crypto/serpent_sse2_glue.c2
-rw-r--r--arch/x86/include/asm/crypto/serpent-avx.h (renamed from arch/x86/include/asm/serpent-avx.h)0
-rw-r--r--arch/x86/include/asm/crypto/serpent-sse2.h (renamed from arch/x86/include/asm/serpent-sse2.h)0
4 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/serpent_avx_glue.c b/arch/x86/crypto/serpent_avx_glue.c
index c61b91aa42a8..b36bdac237eb 100644
--- a/arch/x86/crypto/serpent_avx_glue.c
+++ b/arch/x86/crypto/serpent_avx_glue.c
@@ -38,7 +38,7 @@
#include <crypto/xts.h>
#include <asm/xcr.h>
#include <asm/xsave.h>
-#include <asm/serpent-avx.h>
+#include <asm/crypto/serpent-avx.h>
#include <asm/crypto/ablk_helper.h>
#include <asm/crypto/glue_helper.h>
diff --git a/arch/x86/crypto/serpent_sse2_glue.c b/arch/x86/crypto/serpent_sse2_glue.c
index 49a32eedf0c8..d679c8675f4a 100644
--- a/arch/x86/crypto/serpent_sse2_glue.c
+++ b/arch/x86/crypto/serpent_sse2_glue.c
@@ -41,7 +41,7 @@
#include <crypto/ctr.h>
#include <crypto/lrw.h>
#include <crypto/xts.h>
-#include <asm/serpent-sse2.h>
+#include <asm/crypto/serpent-sse2.h>
#include <asm/crypto/ablk_helper.h>
#include <asm/crypto/glue_helper.h>
diff --git a/arch/x86/include/asm/serpent-avx.h b/arch/x86/include/asm/crypto/serpent-avx.h
index 432deedd2945..432deedd2945 100644
--- a/arch/x86/include/asm/serpent-avx.h
+++ b/arch/x86/include/asm/crypto/serpent-avx.h
diff --git a/arch/x86/include/asm/serpent-sse2.h b/arch/x86/include/asm/crypto/serpent-sse2.h
index e6e77dffbdab..e6e77dffbdab 100644
--- a/arch/x86/include/asm/serpent-sse2.h
+++ b/arch/x86/include/asm/crypto/serpent-sse2.h