3 files changed, 4 insertions, 4 deletions

diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 8d80220932f..d9dd3d677b7 100644
--- a/arch/i386/kernel/Makefile
+++ b/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/arch/i386/kernel/vsyscall-note.S b/arch/i386/kernel/vsyscall-note_32.S
index 07c0daf7823..07c0daf7823 100644
--- a/arch/i386/kernel/vsyscall-note.S
+++ b/arch/i386/kernel/vsyscall-note_32.S
diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86_64/ia32/vsyscall-sigreturn.S
index 1384367cdbe..83e7fd683c3 100644
--- a/arch/x86_64/ia32/vsyscall-sigreturn.S
+++ b/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"