x86_64: move boot

Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
mariux64 · Oct 11, 2007 · 9e9b457 · 9e9b457
1 parent aadfb67
commit 9e9b457
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 8 deletions.
diff --git 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 → arch/x86/boot/compressed/Makefile_64 b/arch/x86_64/boot/compressed/Makefile_64 → 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 → arch/x86/boot/compressed/head_64.S b/arch/x86_64/boot/compressed/head_64.S → 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 → arch/x86/boot/compressed/misc_64.c b/arch/x86_64/boot/compressed/misc_64.c → arch/x86/boot/compressed/misc_64.c
diff --git a/arch/x86_64/boot/compressed/vmlinux_64.lds → arch/x86/boot/compressed/vmlinux_64.lds b/arch/x86_64/boot/compressed/vmlinux_64.lds → arch/x86/boot/compressed/vmlinux_64.lds
diff --git a/arch/x86_64/boot/compressed/vmlinux_64.scr → arch/x86/boot/compressed/vmlinux_64.scr b/arch/x86_64/boot/compressed/vmlinux_64.scr → arch/x86/boot/compressed/vmlinux_64.scr
diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile