---

yaml --- r: 65577 b: refs/heads/master c: 9e9b457 h: refs/heads/master i: 65575: b01652a v: v3
git-mirror · Oct 11, 2007 · de08d32 · de08d32
1 parent ea00074
commit de08d32
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aadfb679c8eb9b83125833f03b5221889595b67c
+refs/heads/master: 9e9b4573e4411ac5fcfb6ba04ad360d3de6414ba
diff --git a/trunk/arch/x86/boot/compressed/Makefile b/trunk/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/...k/arch/x86_64/boot/compressed/Makefile_64 → trunk/arch/x86/boot/compressed/Makefile_64 b/...k/arch/x86_64/boot/compressed/Makefile_64 → trunk/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/trunk/arch/x86_64/boot/compressed/head_64.S → trunk/arch/x86/boot/compressed/head_64.S b/trunk/arch/x86_64/boot/compressed/head_64.S → trunk/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/trunk/arch/x86_64/boot/compressed/misc_64.c → trunk/arch/x86/boot/compressed/misc_64.c b/trunk/arch/x86_64/boot/compressed/misc_64.c → trunk/arch/x86/boot/compressed/misc_64.c
diff --git a/...rch/x86_64/boot/compressed/vmlinux_64.lds → ...k/arch/x86/boot/compressed/vmlinux_64.lds b/...rch/x86_64/boot/compressed/vmlinux_64.lds → ...k/arch/x86/boot/compressed/vmlinux_64.lds
diff --git a/...rch/x86_64/boot/compressed/vmlinux_64.scr → ...k/arch/x86/boot/compressed/vmlinux_64.scr b/...rch/x86_64/boot/compressed/vmlinux_64.scr → ...k/arch/x86/boot/compressed/vmlinux_64.scr
diff --git a/trunk/arch/x86_64/boot/compressed/Makefile b/trunk/arch/x86_64/boot/compressed/Makefile