diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:15 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:17:15 +0200 |
| commit | 9e9b4573e4411ac5fcfb6ba04ad360d3de6414ba (patch) | |
| tree | 8e62dbe670e98552cf6ff7b9b5b59597e3143bf3 | |
| parent | aadfb679c8eb9b83125833f03b5221889595b67c (diff) | |
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>
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/Makefile_64 (renamed from arch/x86_64/boot/compressed/Makefile_64) | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/head_64.S (renamed from arch/x86_64/boot/compressed/head_64.S) | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/misc_64.c (renamed from arch/x86_64/boot/compressed/misc_64.c) | 0 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux_64.lds (renamed from arch/x86_64/boot/compressed/vmlinux_64.lds) | 0 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux_64.scr (renamed from arch/x86_64/boot/compressed/vmlinux_64.scr) | 0 | ||||
| -rw-r--r-- | arch/x86_64/boot/compressed/Makefile | 5 |
7 files changed, 3 insertions, 8 deletions
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 76ab5caddf9..52c1db85452 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 5bfd108f29d..dc6b3380cc4 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 49467640751..cff3d1dc5dd 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 f932b0e8909..f932b0e8909 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 94c13e557fb..94c13e557fb 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 bd1429ce193..bd1429ce193 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 76ab5caddf9..00000000000 --- 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 |