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 c6620031053568f2e426bc15d26b8f161f5bf7ee..6eafac3b2a7b0e0ffc1ca6e9f208a80d6064a3f9 100644 (file)
--- 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