From 9f7407a1ae7917d67e0caeb8494b65a264d36c67 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:16:06 +0200
Subject: [PATCH] --- yaml --- r: 65535 b: refs/heads/master c:
 16cfc182fd3749644a35a134316766dcef5f0d24 h: refs/heads/master i:   65533:
 091d6763095c2048705674f5b5d5fa3e252f0541   65531:
 dbe19e4941eaa08c39f79c52ecd52e6b7b203fb4   65527:
 aaf1dc9834cbac4ab1c7a33a7f5fbe621c1fd73f   65519:
 f62529840b768d29f33ab0b238197d51444a845e   65503:
 8861dbac509be70a536c98f504b4d56c7bd1ccd8   65471:
 cb429ddd9feb50a07b9bc41d85d84b18b3d70141   65407:
 eec7c4b4a1f272f69b48ffaf73d7d2b449164fe2   65279:
 beba9cd3c8eb8622b43c767e29b74796849a40b4   65023:
 d28d8c37e3f4ff6dcc1d46d824766f7e7493564d   64511:
 c3008c10cc12a0d226a77b8a17719b53710bd4cb   63487:
 8031156924b9ef682436918f5ea3f5b322cdd5a0   61439:
 aaeee93866c1bace2aa06b5b76955ea24433af55   57343:
 f802f7a104b9d0892ea2759fee445440f015ed2e   49151:
 c993739f079dc13b69fc8521272c42ff6e4c1f70   32767:
 5ae4f0356026b0363efef5eff8fdbdc7fb85add4 v: v3

---
 [refs]                                                  | 2 +-
 trunk/arch/x86_64/boot/compressed/Makefile              | 4 ++--
 trunk/arch/x86_64/boot/compressed/{head.S => head_64.S} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename trunk/arch/x86_64/boot/compressed/{head.S => head_64.S} (100%)

diff --git a/[refs] b/[refs]
index 3bf977af360f..ac170db192ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5e96ef2899fb9d6009a53f83952e00cad2a97ab
+refs/heads/master: 16cfc182fd3749644a35a134316766dcef5f0d24
diff --git a/trunk/arch/x86_64/boot/compressed/Makefile b/trunk/arch/x86_64/boot/compressed/Makefile
index 6fb949582b23..5bfd108f29d3 100644
--- a/trunk/arch/x86_64/boot/compressed/Makefile
+++ b/trunk/arch/x86_64/boot/compressed/Makefile
@@ -4,7 +4,7 @@
 # create a compressed vmlinux image from the original vmlinux
 #
 
-targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc_64.o piggy.o
+targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head_64.o misc_64.o piggy.o
 
 CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2  \
 	  -fno-strict-aliasing -fPIC -mcmodel=small \
@@ -14,7 +14,7 @@ AFLAGS  := $(CFLAGS) -D__ASSEMBLY__
 LDFLAGS := -m elf_x86_64
 
 LDFLAGS_vmlinux := -T
-$(obj)/vmlinux: $(src)/vmlinux_64.lds $(obj)/head.o $(obj)/misc_64.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o $(obj)/piggy.o FORCE
 	$(call if_changed,ld)
 	@:
 
diff --git a/trunk/arch/x86_64/boot/compressed/head.S b/trunk/arch/x86_64/boot/compressed/head_64.S
similarity index 100%
rename from trunk/arch/x86_64/boot/compressed/head.S
rename to trunk/arch/x86_64/boot/compressed/head_64.S