From eec7c4b4a1f272f69b48ffaf73d7d2b449164fe2 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:13:13 +0200
Subject: [PATCH] --- yaml --- r: 65407 b: refs/heads/master c:
 565b56cc9929fd4e682850df960f0766c8363383 h: refs/heads/master i:   65405:
 1707f9d3e7a3fd4081d3d285bd7246ca722c3fe9   65403:
 d0a08cfd4c1ae1ae7068c2a85de18cb127767236   65399:
 3fff7ace6790213bd2a5cf0b8d66c4d2a46dfedb   65391:
 11410c1427e510c1c0e722b36fb86e2cbfa5a6fe   65375:
 7c1a23971b457b37339c6840c0139066f1a7f218   65343:
 7bf1215a1df5ccfd750d1c5ec8b808f3be6112e2   65279:
 beba9cd3c8eb8622b43c767e29b74796849a40b4 v: v3

---
 [refs]                                                      | 2 +-
 trunk/arch/i386/kernel/Makefile                             | 6 +++---
 .../i386/kernel/{vsyscall-note.S => vsyscall-note_32.S}     | 0
 trunk/arch/x86_64/ia32/vsyscall-sigreturn.S                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename trunk/arch/i386/kernel/{vsyscall-note.S => vsyscall-note_32.S} (100%)

diff --git a/[refs] b/[refs]
index d7c838d429bb..b1602d9522ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcaf15d788dc0c8354dbcf449e260cb303120b75
+refs/heads/master: 565b56cc9929fd4e682850df960f0766c8363383
diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile
index 8d80220932f8..d9dd3d677b72 100644
--- a/trunk/arch/i386/kernel/Makefile
+++ b/trunk/arch/i386/kernel/Makefile
@@ -52,7 +52,7 @@ obj-$(CONFIG_SCx200)		+= scx200_32.o
 # Note: kbuild does not track this dependency due to usage of .incbin
 $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so
 targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
-targets += vsyscall-note.o vsyscall_32.lds
+targets += vsyscall-note_32.o vsyscall_32.lds
 
 # The DSO images are built using a special linker script.
 quiet_cmd_syscall = SYSCALL $@
@@ -68,7 +68,7 @@ SYSCFLAGS_vsyscall-int80_32.so	= $(vsyscall-flags)
 
 $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \
 $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \
-		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
+		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.o FORCE
 	$(call if_changed,syscall)
 
 # We also create a special relocatable object that should mirror the symbol
@@ -80,7 +80,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
 
 SYSCFLAGS_vsyscall-syms.o = -r
 $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \
-			$(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note.o FORCE
+			$(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note_32.o FORCE
 	$(call if_changed,syscall)
 
 k8-y                      += ../../x86_64/kernel/k8.o
diff --git a/trunk/arch/i386/kernel/vsyscall-note.S b/trunk/arch/i386/kernel/vsyscall-note_32.S
similarity index 100%
rename from trunk/arch/i386/kernel/vsyscall-note.S
rename to trunk/arch/i386/kernel/vsyscall-note_32.S
diff --git a/trunk/arch/x86_64/ia32/vsyscall-sigreturn.S b/trunk/arch/x86_64/ia32/vsyscall-sigreturn.S
index 1384367cdbe1..83e7fd683c3d 100644
--- a/trunk/arch/x86_64/ia32/vsyscall-sigreturn.S
+++ b/trunk/arch/x86_64/ia32/vsyscall-sigreturn.S
@@ -139,5 +139,5 @@ __kernel_rt_sigreturn:
 	.align 4
 .LENDFDE3:
 
-#include "../../i386/kernel/vsyscall-note.S"
+#include "../../i386/kernel/vsyscall-note_32.S"