Merge r6641 (Handle sys_ioprio_set on amd64-linux.)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6715

diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h
index 5c78554865f14cffcf0efe12576f9f47e106b693..1ce3b13b9515aa437b41af9e6684dc724aff6060 100644 (file)
--- a/coregrind/m_syswrap/priv_syswrap-linux.h
+++ b/coregrind/m_syswrap/priv_syswrap-linux.h
@@ -97,6 +97,8 @@ DECL_TEMPLATE(linux, sys_io_getevents);
 DECL_TEMPLATE(linux, sys_io_submit);
 DECL_TEMPLATE(linux, sys_io_cancel);
 
+DECL_TEMPLATE(linux, sys_ioprio_set);
+
 DECL_TEMPLATE(linux, sys_mbind);
 DECL_TEMPLATE(linux, sys_set_mempolicy);
 DECL_TEMPLATE(linux, sys_get_mempolicy);

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index e7f3a7a82b173ced0bafc197e8b1b29cc95f6f55..536440d0076085cb14089d828c25749ee99e9c60 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -1302,7 +1302,7 @@ const SyscallTableEntry ML_(syscall_table)[] = {
 //   LINX_(__NR_request_key,       sys_request_key),    // 249
 
 //   LINXY(__NR_keyctl,            sys_keyctl),         // 250
-//   LINX_(__NR_ioprio_set,        sys_ioprio_set),     // 251
+   LINX_(__NR_ioprio_set,        sys_ioprio_set),     // 251
 //   LINX_(__NR_ioprio_get,        sys_ioprio_get),     // 252
    LINX_(__NR_inotify_init,     sys_inotify_init),   // 253
    LINX_(__NR_inotify_add_watch, sys_inotify_add_watch), // 254

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index ea339d46268c3130b05af961bca6aaf46070ec11..a53b9d9d656d1bfe474464b52fae85de8ff2c29b 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -2611,6 +2611,19 @@ PRE(sys_faccessat)
    PRE_MEM_RASCIIZ( "faccessat(pathname)", ARG2 );
 }
 
+/* ---------------------------------------------------------------------
+   ioprio_ wrappers
+   ------------------------------------------------------------------ */
+
+/* _syscall3(int, ioprio_set, int, which, int, who, int, ioprio); */
+
+PRE(sys_ioprio_set)
+{
+   PRINT("sys_ioprio_set ( %ld, %ld, %ld )", ARG1,ARG2,ARG3);
+   PRE_REG_READ3(int, "ioprio_set", int, which, int, who, int, ioprio);
+}
+
+
 #undef PRE
 #undef POST