tests: move F_OFD_SETLK* checks from fcntl64.c to fcntl-common.c

[strace] / kexec.c

diff --git a/kexec.c b/kexec.c
index fe11723319b8c1972ad45656d5eb11c11dec488c..68fac1584f4c99ef36c3479bba38afa0e746e111 100644 (file)
--- a/kexec.c
+++ b/kexec.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,10 +41,10 @@
 static bool
 print_seg(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       const kernel_ureg_t *seg;
-       kernel_ureg_t seg_buf[4];
+       const kernel_ulong_t *seg;
+       kernel_ulong_t seg_buf[4];
 
-        if (elem_size < sizeof(seg_buf)) {
+       if (elem_size < sizeof(seg_buf)) {
                unsigned int i;
 
                for (i = 0; i < ARRAY_SIZE(seg_buf); ++i)
@@ -55,43 +56,43 @@ print_seg(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 
        tprints("{buf=");
        printaddr(seg[0]);
-       tprintf(", bufsz=%" PRI_kru ", mem=", seg[1]);
+       tprintf(", bufsz=%" PRI_klu ", mem=", seg[1]);
        printaddr(seg[2]);
-       tprintf(", memsz=%" PRI_kru "}", seg[3]);
+       tprintf(", memsz=%" PRI_klu "}", seg[3]);
 
        return true;
 }
 
 static void
-print_kexec_segments(struct tcb *const tcp, const kernel_ureg_t addr,
-                    const kernel_ureg_t len)
+print_kexec_segments(struct tcb *const tcp, const kernel_ulong_t addr,
+                    const kernel_ulong_t len)
 {
        if (len > KEXEC_SEGMENT_MAX) {
                printaddr(addr);
                return;
        }
 
-       kernel_ureg_t seg[4];
+       kernel_ulong_t seg[4];
        const size_t sizeof_seg = ARRAY_SIZE(seg) * current_wordsize;
 
        print_array(tcp, addr, len, seg, sizeof_seg,
-                   umoven_or_printaddr, print_seg, 0);
+                   tfetch_mem, print_seg, 0);
 }
 
 SYS_FUNC(kexec_load)
 {
        /* entry, nr_segments */
        printaddr(tcp->u_arg[0]);
-       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
 
        /* segments */
        print_kexec_segments(tcp, tcp->u_arg[2], tcp->u_arg[1]);
        tprints(", ");
 
        /* flags */
-       kernel_ureg_t n = tcp->u_arg[3];
+       kernel_ulong_t n = tcp->u_arg[3];
        printxval64(kexec_arch_values, n & KEXEC_ARCH_MASK, "KEXEC_ARCH_???");
-       n &= ~(kernel_ureg_t) KEXEC_ARCH_MASK;
+       n &= ~(kernel_ulong_t) KEXEC_ARCH_MASK;
        if (n) {
                tprints("|");
                printflags64(kexec_load_flags, n, "KEXEC_???");
@@ -111,12 +112,12 @@ SYS_FUNC(kexec_file_load)
        printfd(tcp, tcp->u_arg[1]);
        tprints(", ");
        /* cmdline_len */
-       tprintf("%" PRI_klu ", ", getarg_klu(tcp, 2));
+       tprintf("%" PRI_klu ", ", tcp->u_arg[2]);
        /* cmdline */
        printstrn(tcp, tcp->u_arg[3], tcp->u_arg[2]);
        tprints(", ");
        /* flags */
-       printflags64(kexec_file_load_flags, getarg_klu(tcp, 4), "KEXEC_FILE_???");
+       printflags64(kexec_file_load_flags, tcp->u_arg[4], "KEXEC_FILE_???");
 
        return RVAL_DECODED;
 }