build warning: silence a warning

and correct a comment referring to the wrong system header

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index cbb692db92cbdbba5d039e4a44affe0246cb691b..9333dfde1dd70fbe8110d12360c9ce77fd944376 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -1860,8 +1860,8 @@ PRE(sys_futex_waitv)
      *                                 unsigned int nr_futexes, unsigned int flags,
      *                                 struct __kernel_timespec __user *timeout, clockid_t clockid); */
     *flags |= SfMayBlock;
-    PRINT("sys_futex_waitv ( %#" FMT_REGWORD "x, %ld, %ld, %#" FMT_REGWORD "x, %d )",
-          ARG1, SARG2, SARG3, ARG4, ARG5);
+    PRINT("sys_futex_waitv ( %#" FMT_REGWORD "x, %ld, %ld, %#" FMT_REGWORD "x, %" FMT_REGWORD "d )",
+          ARG1, SARG2, SARG3, ARG4, SARG5);
     PRE_MEM_READ("sys_futex_waitv(waiters)", ARG1, sizeof(struct vki_futex_waitv) * ARG2);
     PRE_MEM_READ("sys_futex_waitv(timeout)", ARG4, sizeof(struct vki__kernel_timespec));
 }

diff --git a/include/vki/vki-freebsd.h b/include/vki/vki-freebsd.h
index 1a371245f605cd57c2044ea4b56af389860e0af8..ee4748c280dd2d0994d897862e9b909356c4ad5a 100644 (file)
--- a/include/vki/vki-freebsd.h
+++ b/include/vki/vki-freebsd.h
@@ -3268,7 +3268,7 @@ union vki_ccb {
 #define VKI_CAMIOCOMMAND _VKI_IOWR(VKI_CAM_VERSION, 2, union vki_ccb)
 
 //----------------------------------------------------------------------
-// From cam/scsi/scsi_all.h
+// From sys/ucred,h
 //----------------------------------------------------------------------
 struct vki_setcred {
    vki_uid_t    sc_uid;                /* effective user id */