[valgrind] 3.10.1-6 - Add mount and umount2 to valgrind-3.10.1-aarch64-syscalls.patch.

[Mark Wielaard]

commit 6f93c82797732e6dba41eec4e7a2fbc9f74ef6a1
Author: Mark Wielaard <mjw at redhat.com>
Date:   Wed Feb 18 15:58:59 2015 +0100

    3.10.1-6 - Add mount and umount2 to valgrind-3.10.1-aarch64-syscalls.patch.

 valgrind-3.10.1-aarch64-syscalls.patch |   42 ++++++++++++++++++++++++++++++++
 valgrind.spec                          |    9 ++++---
 2 files changed, 47 insertions(+), 4 deletions(-)
---
diff --git a/valgrind-3.10.1-aarch64-syscalls.patch b/valgrind-3.10.1-aarch64-syscalls.patch
index 7ee1e40..389b841 100644
--- a/valgrind-3.10.1-aarch64-syscalls.patch
+++ b/valgrind-3.10.1-aarch64-syscalls.patch
@@ -147,3 +147,45 @@ index c23e6f7..1f9670a 100644
  //ZZ    LINXY(__NR_name_to_handle_at, sys_name_to_handle_at),// 370
  //ZZ    LINXY(__NR_open_by_handle_at, sys_open_by_handle_at),// 371
  //ZZ    LINXY(__NR_clock_adjtime,     sys_clock_adjtime)     // 372
+commit 52e770f94992d381dc1dbe104770ebc8cb9937c4
+Author: mjw <mjw at a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date:   Wed Feb 18 14:23:17 2015 +0000
+
+    Bug #344307 2 unhandled syscalls on aarch64/arm64: umount2(39), mount (40)
+    
+    Reporter: Branislav Blaskovic, bblaskov at redhat.com
+    Patch: Robin Hack, rhack at redhat.com
+    Test: Miloš Prchlík, mprchlik at redhat.com
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14944 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
+index 7b7e824..fc6ca08 100644
+--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
++++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
+@@ -887,6 +887,9 @@ static SyscallTableEntry syscall_main_table[] = {
+    LINX_(__NR_linkat,            sys_linkat),            // 37
+    LINX_(__NR_renameat,		 sys_renameat),          // 38
+ 
++   LINX_(__NR_umount2,            sys_umount),           // 39
++   LINX_(__NR_mount,              sys_mount),            // 40
++
+    // FIXME IS THIS CORRECT?  it may well not be.
+    GENXY(__NR3264_statfs,        sys_statfs),            // 43
+    GENXY(__NR3264_fstatfs,       sys_fstatfs),           // 44
+@@ -1075,7 +1078,6 @@ static SyscallTableEntry syscall_main_table[] = {
+ //ZZ    LINX_(__NR_lseek,             sys_lseek),          // 19
+ //ZZ 
+ //ZZ    GENX_(__NR_getpid,            sys_getpid),         // 20
+-//ZZ    LINX_(__NR_mount,             sys_mount),          // 21
+ //ZZ    LINX_(__NR_umount,            sys_oldumount),      // 22
+ //ZZ    LINX_(__NR_setuid,            sys_setuid16),       // 23 ## P
+ //ZZ    LINX_(__NR_getuid,            sys_getuid16),       // 24 ## P
+@@ -1107,7 +1109,6 @@ static SyscallTableEntry syscall_main_table[] = {
+ //ZZ 
+ //ZZ    LINX_(__NR_getegid,           sys_getegid16),      // 50
+ //ZZ    GENX_(__NR_acct,              sys_acct),           // 51
+-//ZZ    LINX_(__NR_umount2,           sys_umount),         // 52
+ //ZZ //   GENX_(__NR_lock,              sys_ni_syscall),     // 53
+ //ZZ 
+ //ZZ    LINXY(__NR_fcntl,             sys_fcntl),          // 55
diff --git a/valgrind.spec b/valgrind.spec
index 0eb0a1b..51b798b 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.10.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -64,9 +64,9 @@ Patch5: valgrind-3.10.1-mempcpy.patch
 # KDE#343802 - s390x memcheck reports spurious conditional jump
 Patch6: valgrind-3.10-s390-spechelper.patch
 
-# KDE#342038, KDE#343732, KDE#343733, KDE#344007
+# KDE#342038, KDE#343732, KDE#343733, KDE#344007, KDE#344307
 # mbind, get_mempolicy, set_mempolicy, flock, setgid, msgget, msgctl,
-# msgrcv, msgsnd, accept4
+# msgrcv, msgsnd, accept4, mount, umount2
 Patch7: valgrind-3.10.1-aarch64-syscalls.patch
 
 # KDE#344007 ppc64 missing accept4 syscall
@@ -332,8 +332,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
-* Wed Feb 18 2015 Mark Wielaard <mjw at redhat.com>
+* Wed Feb 18 2015 Mark Wielaard <mjw at redhat.com> - 3.10.1-6
 - Add valgrind-3.10.1-send-recv-mmsg.patch
+- Add mount and umount2 to valgrind-3.10.1-aarch64-syscalls.patch.
 
 * Tue Feb 10 2015 Mark Wielaard <mjw at redhat.com> - 3.10.1-5
 - Add accept4 to valgrind-3.10.1-aarch64-syscalls.patch.