x86_64: move crypto

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
index b1bcf7c63028822ef0c19d5509d40c7806c09190..18dcdc6fb7aa86a43c781a14976091ea1e3a8a48 100644 (file)
--- a/arch/x86/crypto/Makefile
+++ b/arch/x86/crypto/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
 include ${srctree}/arch/x86/crypto/Makefile_32
 else
-include ${srctree}/arch/x86_64/crypto/Makefile_64
+include ${srctree}/arch/x86/crypto/Makefile_64
 endif

diff --git a/arch/x86_64/crypto/Makefile_64 b/arch/x86/crypto/Makefile_64
similarity index 90%
rename from arch/x86_64/crypto/Makefile_64
rename to arch/x86/crypto/Makefile_64
index c96faeb842c8e89309c9a205b9ea5b159211c9b3..b40896276e93df31d666b5b14090a5db3b7f0185 100644 (file)
--- a/arch/x86_64/crypto/Makefile_64
+++ b/arch/x86/crypto/Makefile_64
@@ -1,5 +1,5 @@
 # 
-# x86_64/crypto/Makefile 
+# x86/crypto/Makefile 
 # 
 # Arch-specific CryptoAPI modules.
 # 

diff --git a/arch/x86_64/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
similarity index 100%
rename from arch/x86_64/crypto/aes-x86_64-asm_64.S
rename to arch/x86/crypto/aes-x86_64-asm_64.S

diff --git a/arch/x86_64/crypto/aes_64.c b/arch/x86/crypto/aes_64.c
similarity index 100%
rename from arch/x86_64/crypto/aes_64.c
rename to arch/x86/crypto/aes_64.c

diff --git a/arch/x86_64/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
similarity index 100%
rename from arch/x86_64/crypto/twofish-x86_64-asm_64.S
rename to arch/x86/crypto/twofish-x86_64-asm_64.S

diff --git a/arch/x86_64/crypto/twofish_64.c b/arch/x86/crypto/twofish_64.c
similarity index 100%
rename from arch/x86_64/crypto/twofish_64.c
rename to arch/x86/crypto/twofish_64.c

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 0416dd2f2dbcb78936d6ebee461d2e5b4c972a1a..265484c1723498c0651df7b8a43cebee98fa31bc 100644 (file)
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -76,7 +76,7 @@ head-y := arch/x86_64/kernel/head_64.o arch/x86_64/kernel/head64.o arch/x86_64/k
 libs-y                                         += arch/x86_64/lib/
 core-y                                 += arch/x86_64/kernel/ \
                                           arch/x86_64/mm/ \
-                                          arch/x86_64/crypto/ \
+                                          arch/x86/crypto/ \
                                           arch/x86_64/vdso/
 core-$(CONFIG_IA32_EMULATION)          += arch/x86_64/ia32/
 drivers-$(CONFIG_PCI)                  += arch/x86_64/pci/

diff --git a/arch/x86_64/crypto/Makefile b/arch/x86_64/crypto/Makefile
deleted file mode 100644 (file)
index b1bcf7c..0000000
--- a/arch/x86_64/crypto/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/crypto/Makefile_32
-else
-include ${srctree}/arch/x86_64/crypto/Makefile_64
-endif