Просмотр исходного кода

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>
Thomas Gleixner 17 лет назад
Родитель
Сommit
9e9b4573e4

+ 1 - 1
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

+ 1 - 1
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
 #

+ 1 - 1
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

+ 0 - 0
arch/x86_64/boot/compressed/misc_64.c → arch/x86/boot/compressed/misc_64.c


+ 0 - 0
arch/x86_64/boot/compressed/vmlinux_64.lds → arch/x86/boot/compressed/vmlinux_64.lds


+ 0 - 0
arch/x86_64/boot/compressed/vmlinux_64.scr → arch/x86/boot/compressed/vmlinux_64.scr


+ 0 - 5
arch/x86_64/boot/compressed/Makefile

@@ -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