x86_64: move crypto

Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
mrcsosa · Oct 11, 2007 · 987c75d · 987c75d
1 parent 9a163ed
commit 987c75d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 8 deletions.
diff --git 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 → arch/x86/crypto/Makefile_64 b/arch/x86_64/crypto/Makefile_64 → 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 → arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86_64/crypto/aes-x86_64-asm_64.S → arch/x86/crypto/aes-x86_64-asm_64.S
diff --git a/arch/x86_64/crypto/aes_64.c → arch/x86/crypto/aes_64.c b/arch/x86_64/crypto/aes_64.c → arch/x86/crypto/aes_64.c
diff --git a/arch/x86_64/crypto/twofish-x86_64-asm_64.S → arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86_64/crypto/twofish-x86_64-asm_64.S → arch/x86/crypto/twofish-x86_64-asm_64.S
diff --git a/arch/x86_64/crypto/twofish_64.c → arch/x86/crypto/twofish_64.c b/arch/x86_64/crypto/twofish_64.c → arch/x86/crypto/twofish_64.c
diff --git 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