From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 4 Oct 2005 19:31:23 +0000 (+0000)
Subject: do not link over the non-xenU vsyscall-note.S
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~82
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6001006cad06d0e9b3410167b61c989e1fd4af1a;p=linux-2.6.git

do not link over the non-xenU vsyscall-note.S
---

diff --git a/arch/xen/i386/kernel/Makefile b/arch/xen/i386/kernel/Makefile
index d047f36f2..0edd0f45b 100644
--- a/arch/xen/i386/kernel/Makefile
+++ b/arch/xen/i386/kernel/Makefile
@@ -88,8 +88,8 @@ $(obj)/vsyscall-syms.o: $(obj)/vsyscall.lds \
 	$(call if_changed,syscall)
 
 c-link	:= init_task.o
-s-link	:= vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o \
-		vsyscall-note.o
+s-link	:= vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o # \
+		# vsyscall-note.o MEF: looks like this should not be here.
 
 $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
 	@ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@