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>

7 files changed, 3 insertions, 8 deletions

diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 76ab5caddf9a..52c1db854520 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
index 5bfd108f29d3..dc6b3380cc45 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
index 49467640751f..cff3d1dc5dd4 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
index f932b0e89096..f932b0e89096 100644
--- a/arch/x86_64/boot/compressed/misc_64.c
+++ b/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
index 94c13e557fb4..94c13e557fb4 100644
--- a/arch/x86_64/boot/compressed/vmlinux_64.lds
+++ b/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
index bd1429ce193e..bd1429ce193e 100644
--- a/arch/x86_64/boot/compressed/vmlinux_64.scr
+++ b/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 76ab5caddf9a..000000000000
--- 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