From 9e9b4573e4411ac5fcfb6ba04ad360d3de6414ba Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:17:15 +0200 Subject: [PATCH] x86_64: move boot Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/Makefile | 2 +- arch/{x86_64 => x86}/boot/compressed/Makefile_64 | 2 +- arch/{x86_64 => x86}/boot/compressed/head_64.S | 2 +- arch/{x86_64 => x86}/boot/compressed/misc_64.c | 0 arch/{x86_64 => x86}/boot/compressed/vmlinux_64.lds | 0 arch/{x86_64 => x86}/boot/compressed/vmlinux_64.scr | 0 arch/x86_64/boot/compressed/Makefile | 5 ----- 7 files changed, 3 insertions(+), 8 deletions(-) rename arch/{x86_64 => x86}/boot/compressed/Makefile_64 (94%) rename arch/{x86_64 => x86}/boot/compressed/head_64.S (99%) rename arch/{x86_64 => x86}/boot/compressed/misc_64.c (100%) rename arch/{x86_64 => x86}/boot/compressed/vmlinux_64.lds (100%) rename arch/{x86_64 => x86}/boot/compressed/vmlinux_64.scr (100%) delete mode 100644 arch/x86_64/boot/compressed/Makefile diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 76ab5caddf..52c1db8545 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) include ${srctree}/arch/x86/boot/compressed/Makefile_32 else -include ${srctree}/arch/x86_64/boot/compressed/Makefile_64 +include ${srctree}/arch/x86/boot/compressed/Makefile_64 endif diff --git a/arch/x86_64/boot/compressed/Makefile_64 b/arch/x86/boot/compressed/Makefile_64 similarity index 94% rename from arch/x86_64/boot/compressed/Makefile_64 rename to arch/x86/boot/compressed/Makefile_64 index 5bfd108f29..dc6b3380cc 100644 --- a/arch/x86_64/boot/compressed/Makefile_64 +++ b/arch/x86/boot/compressed/Makefile_64 @@ -1,5 +1,5 @@ # -# linux/arch/x86_64/boot/compressed/Makefile +# linux/arch/x86/boot/compressed/Makefile # # create a compressed vmlinux image from the original vmlinux # diff --git a/arch/x86_64/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S similarity index 99% rename from arch/x86_64/boot/compressed/head_64.S rename to arch/x86/boot/compressed/head_64.S index 4946764075..cff3d1dc5d 100644 --- a/arch/x86_64/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S @@ -174,7 +174,7 @@ no_longmode: hlt jmp 1b -#include "../../kernel/verify_cpu_64.S" +#include "../../../x86_64/kernel/verify_cpu_64.S" /* Be careful here startup_64 needs to be at a predictable * address so I can export it in an ELF header. Bootloaders diff --git a/arch/x86_64/boot/compressed/misc_64.c b/arch/x86/boot/compressed/misc_64.c similarity index 100% rename from arch/x86_64/boot/compressed/misc_64.c rename to arch/x86/boot/compressed/misc_64.c diff --git a/arch/x86_64/boot/compressed/vmlinux_64.lds b/arch/x86/boot/compressed/vmlinux_64.lds similarity index 100% rename from arch/x86_64/boot/compressed/vmlinux_64.lds rename to arch/x86/boot/compressed/vmlinux_64.lds diff --git a/arch/x86_64/boot/compressed/vmlinux_64.scr b/arch/x86/boot/compressed/vmlinux_64.scr similarity index 100% rename from arch/x86_64/boot/compressed/vmlinux_64.scr rename to arch/x86/boot/compressed/vmlinux_64.scr diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile deleted file mode 100644 index 76ab5caddf..0000000000 --- a/arch/x86_64/boot/compressed/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/x86/boot/compressed/Makefile_32 -else -include ${srctree}/arch/x86_64/boot/compressed/Makefile_64 -endif -- 2.39.5