From 06f210ece37241706d8a039fffd204319c7acfb7 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:12:30 +0200
Subject: [PATCH] --- yaml --- r: 65377 b: refs/heads/master c:
 24f5b95bb91a6edac5dfdc7ddcbd6cabe0b30430 h: refs/heads/master i:   65375:
 7c1a23971b457b37339c6840c0139066f1a7f218 v: v3

---
 [refs]                                                      | 2 +-
 trunk/arch/i386/kernel/Makefile                             | 6 +++---
 .../i386/kernel/{vsyscall-int80.S => vsyscall-int80_32.S}   | 0
 trunk/arch/i386/kernel/vsyscall_32.S                        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename trunk/arch/i386/kernel/{vsyscall-int80.S => vsyscall-int80_32.S} (100%)

diff --git a/[refs] b/[refs]
index 84031d458115..5b454bebd382 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c3a41e9a1f72bb995a6fb89ad028eda9a14c3d
+refs/heads/master: 24f5b95bb91a6edac5dfdc7ddcbd6cabe0b30430
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 38d2b469a891..84297d470df2 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -50,7 +50,7 @@ obj-$(CONFIG_SCx200)		+= scx200.o
 # vsyscall_32.o contains the vsyscall DSO images as __initdata.
 # We must build both images before we can assemble it.
 # Note: kbuild does not track this dependency due to usage of .incbin
-$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
+$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so
 targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
 targets += vsyscall-note.o vsyscall_32.lds
 
@@ -64,9 +64,9 @@ export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH)
 vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
 		 $(call ld-option, -Wl$(comma)--hash-style=sysv)
 SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
-SYSCFLAGS_vsyscall-int80.so	= $(vsyscall-flags)
+SYSCFLAGS_vsyscall-int80_32.so	= $(vsyscall-flags)
 
-$(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
+$(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so: \
 $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \
 		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
 	$(call if_changed,syscall)
diff --git a/trunk/arch/i386/kernel/vsyscall-int80.S b/trunk/arch/i386/kernel/vsyscall-int80_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/vsyscall-int80.S
rename to trunk/arch/i386/kernel/vsyscall-int80_32.S
diff --git a/trunk/arch/i386/kernel/vsyscall_32.S b/trunk/arch/i386/kernel/vsyscall_32.S
index b403890fe39b..033074479fca 100644
--- a/trunk/arch/i386/kernel/vsyscall_32.S
+++ b/trunk/arch/i386/kernel/vsyscall_32.S
@@ -4,12 +4,12 @@ __INITDATA
 
 	.globl vsyscall_int80_start, vsyscall_int80_end
 vsyscall_int80_start:
-	.incbin "arch/i386/kernel/vsyscall-int80.so"
+	.incbin "arch/i386/kernel/vsyscall-int80_32.so"
 vsyscall_int80_end:
 
 	.globl vsyscall_sysenter_start, vsyscall_sysenter_end
 vsyscall_sysenter_start:
-	.incbin "arch/i386/kernel/vsyscall-sysenter.so"
+	.incbin "arch/i386/kernel/vsyscall-sysenter_32.so"
 vsyscall_sysenter_end:
 
 __FINIT