From 987c75d7170686804b404b7f917b9e4b703702ff Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:17:03 +0200 Subject: [PATCH] x86_64: move crypto Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/crypto/Makefile | 2 +- arch/{x86_64 => x86}/crypto/Makefile_64 | 2 +- arch/{x86_64 => x86}/crypto/aes-x86_64-asm_64.S | 0 arch/{x86_64 => x86}/crypto/aes_64.c | 0 arch/{x86_64 => x86}/crypto/twofish-x86_64-asm_64.S | 0 arch/{x86_64 => x86}/crypto/twofish_64.c | 0 arch/x86_64/Makefile | 2 +- arch/x86_64/crypto/Makefile | 5 ----- 8 files changed, 3 insertions(+), 8 deletions(-) rename arch/{x86_64 => x86}/crypto/Makefile_64 (90%) rename arch/{x86_64 => x86}/crypto/aes-x86_64-asm_64.S (100%) rename arch/{x86_64 => x86}/crypto/aes_64.c (100%) rename arch/{x86_64 => x86}/crypto/twofish-x86_64-asm_64.S (100%) rename arch/{x86_64 => x86}/crypto/twofish_64.c (100%) delete mode 100644 arch/x86_64/crypto/Makefile diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index b1bcf7c63028..18dcdc6fb7aa 100644 --- 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 c96faeb842c8..b40896276e93 100644 --- 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 0416dd2f2dbc..265484c17234 100644 --- 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 index b1bcf7c63028..000000000000 --- 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 -- 2.20.1