mem: decode hugetlb page size in mmap flags

[strace] / mmsghdr.c

diff --git a/mmsghdr.c b/mmsghdr.c
index 94fee4070171957b49d6bea04ce5cc853d0ca47e..c9e6cf0b15f24d6019fd923bd0630c3334f739aa 100644 (file)
--- a/mmsghdr.c
+++ b/mmsghdr.c
@@ -34,7 +34,7 @@
 
 static int
 fetch_struct_mmsghdr_or_printaddr(struct tcb *const tcp,
-                                 const kernel_ureg_t addr,
+                                 const kernel_ulong_t addr,
                                  const unsigned int len, void *const mh)
 {
        if ((entering(tcp) || !syserror(tcp))
@@ -68,7 +68,7 @@ print_struct_mmsghdr(struct tcb *tcp, void *elem_buf,
 
        tprints("{msg_hdr=");
        print_struct_msghdr(tcp, &mmsg->msg_hdr, c->p_user_msg_namelen,
-                           c->use_msg_len ? mmsg->msg_len : (kernel_ureg_t) -1);
+                           c->use_msg_len ? mmsg->msg_len : (kernel_ulong_t) -1);
        if (c->msg_len_vlen) {
                tprintf(", msg_len=%u", mmsg->msg_len);
                --c->msg_len_vlen;
@@ -98,7 +98,7 @@ struct mmsgvec_data {
 };
 
 static void
-save_mmsgvec_namelen(struct tcb *const tcp, kernel_ureg_t addr,
+save_mmsgvec_namelen(struct tcb *const tcp, kernel_ulong_t addr,
                     unsigned int len, const char *const timeout)
 {
        if (len > IOV_MAX)
@@ -125,7 +125,7 @@ save_mmsgvec_namelen(struct tcb *const tcp, kernel_ureg_t addr,
 }
 
 static void
-decode_mmsgvec(struct tcb *const tcp, const kernel_ureg_t addr,
+decode_mmsgvec(struct tcb *const tcp, const kernel_ulong_t addr,
               const unsigned int vlen, const unsigned int msg_len_vlen,
               const bool use_msg_len)
 {
@@ -149,7 +149,7 @@ decode_mmsgvec(struct tcb *const tcp, const kernel_ureg_t addr,
 }
 
 void
-dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ureg_t addr)
+dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ulong_t addr)
 {
        unsigned int len = tcp->u_rval;
        unsigned int i, fetched;
@@ -159,8 +159,8 @@ dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ureg_t addr)
                fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
                if (!fetched)
                        break;
-               tprintf(" = %lu buffers in vector %u\n",
-                       (kernel_ureg_t) mmsg.msg_hdr.msg_iovlen, i);
+               tprintf(" = %" PRI_klu " buffers in vector %u\n",
+                       (kernel_ulong_t) mmsg.msg_hdr.msg_iovlen, i);
                dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
                             ptr_to_kulong(mmsg.msg_hdr.msg_iov),
                             mmsg.msg_len);