From de08d3220c3ef24599c18f1254287846c18bf943 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:17:15 +0200
Subject: [PATCH] --- yaml --- r: 65577 b: refs/heads/master c:
 9e9b4573e4411ac5fcfb6ba04ad360d3de6414ba h: refs/heads/master i:   65575:
 b01652aebcc575dcfe8bfd20025b85b96d32e95d v: v3

---
 [refs]                                                    | 2 +-
 trunk/arch/x86/boot/compressed/Makefile                   | 2 +-
 trunk/arch/{x86_64 => x86}/boot/compressed/Makefile_64    | 2 +-
 trunk/arch/{x86_64 => x86}/boot/compressed/head_64.S      | 2 +-
 trunk/arch/{x86_64 => x86}/boot/compressed/misc_64.c      | 0
 trunk/arch/{x86_64 => x86}/boot/compressed/vmlinux_64.lds | 0
 trunk/arch/{x86_64 => x86}/boot/compressed/vmlinux_64.scr | 0
 trunk/arch/x86_64/boot/compressed/Makefile                | 5 -----
 8 files changed, 4 insertions(+), 9 deletions(-)
 rename trunk/arch/{x86_64 => x86}/boot/compressed/Makefile_64 (94%)
 rename trunk/arch/{x86_64 => x86}/boot/compressed/head_64.S (99%)
 rename trunk/arch/{x86_64 => x86}/boot/compressed/misc_64.c (100%)
 rename trunk/arch/{x86_64 => x86}/boot/compressed/vmlinux_64.lds (100%)
 rename trunk/arch/{x86_64 => x86}/boot/compressed/vmlinux_64.scr (100%)
 delete mode 100644 trunk/arch/x86_64/boot/compressed/Makefile

diff --git a/[refs] b/[refs]
index 712ee4003c9e..0cd5b0833a2e 100644
--- 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
index 76ab5caddf9a..52c1db854520 100644
--- 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/trunk/arch/x86_64/boot/compressed/Makefile_64 b/trunk/arch/x86/boot/compressed/Makefile_64
similarity index 94%
rename from trunk/arch/x86_64/boot/compressed/Makefile_64
rename to trunk/arch/x86/boot/compressed/Makefile_64
index 5bfd108f29d3..dc6b3380cc45 100644
--- a/trunk/arch/x86_64/boot/compressed/Makefile_64
+++ b/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 b/trunk/arch/x86/boot/compressed/head_64.S
similarity index 99%
rename from trunk/arch/x86_64/boot/compressed/head_64.S
rename to trunk/arch/x86/boot/compressed/head_64.S
index 49467640751f..cff3d1dc5dd4 100644
--- a/trunk/arch/x86_64/boot/compressed/head_64.S
+++ b/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 b/trunk/arch/x86/boot/compressed/misc_64.c
similarity index 100%
rename from trunk/arch/x86_64/boot/compressed/misc_64.c
rename to trunk/arch/x86/boot/compressed/misc_64.c
diff --git a/trunk/arch/x86_64/boot/compressed/vmlinux_64.lds b/trunk/arch/x86/boot/compressed/vmlinux_64.lds
similarity index 100%
rename from trunk/arch/x86_64/boot/compressed/vmlinux_64.lds
rename to trunk/arch/x86/boot/compressed/vmlinux_64.lds
diff --git a/trunk/arch/x86_64/boot/compressed/vmlinux_64.scr b/trunk/arch/x86/boot/compressed/vmlinux_64.scr
similarity index 100%
rename from trunk/arch/x86_64/boot/compressed/vmlinux_64.scr
rename to trunk/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
deleted file mode 100644
index 76ab5caddf9a..000000000000
--- a/trunk/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