From: Julian Seward <jseward@acm.org>
Date: Tue, 27 Sep 2005 19:57:35 +0000 (+0000)
Subject: Unbreak build on amd64 following aspacem merge.
X-Git-Tag: svn/VALGRIND_3_1_0~435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dadd73562df95bc59d05aa9e04f44a56b5507c8;p=thirdparty%2Fvalgrind.git

Unbreak build on amd64 following aspacem merge.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4792
---

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index c662003105..6eafac3b2a 100644
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -1168,13 +1168,8 @@ const SyscallTableEntry ML_(syscall_table)[] = {
    GENXY(__NR_fstat,             sys_newfstat),       // 5 
    GENXY(__NR_lstat,             sys_newlstat),       // 6 
    GENXY(__NR_poll,              sys_poll),           // 7 
-<<<<<<< .working
    LINX_(__NR_lseek,             sys_lseek),          // 8 
-   LINXY(__NR_mmap,              sys_mmap2),          // 9 
-=======
-   GENX_(__NR_lseek,             sys_lseek),          // 8 
-   GENX_(__NR_mmap,              sys_mmap2),          // 9 
->>>>>>> .merge-right.r4787
+   LINX_(__NR_mmap,              sys_mmap2),          // 9 
 
    GENXY(__NR_mprotect,          sys_mprotect),       // 10 
    GENXY(__NR_munmap,            sys_munmap),         // 11