diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
| commit | 95de21a430f7bc4166a153b1f69b1425c8a99c7b (patch) | |
| tree | ed0754df09c7e0bd9bafce52cffdd8257a687897 /linux-user | |
| parent | 3459f01b2d9612070ec23221a4ccb60a41b775ae (diff) | |
| parent | d2ad50210b35c2685640f7df931a0fccb49334f7 (diff) | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Christophe Lyon (1) and others
# Via Michael Tokarev
* mjt/trivial-patches:
target-moxie: replace target_phys_addr_t with hwaddr
Rename hexdump to avoid FreeBSD libutil conflict
remove some double-includes
translate: remove redundantly included qemu/timer.h
Remove twice include of qemu-common.h
fix /proc/self/maps output
Message-id: 51977B44.1000302@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/syscall.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 30e93bc0d0..1b3c0ed5f7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5050,10 +5050,10 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min) && h2g_valid(max)) { dprintf(fd, TARGET_ABI_FMT_lx "-" TARGET_ABI_FMT_lx - " %c%c%c%c %08" PRIx64 " %02x:%02x %d%s%s\n", + " %c%c%c%c %08" PRIx64 " %02x:%02x %d %s%s\n", h2g(min), h2g(max), flag_r, flag_w, flag_x, flag_p, offset, dev_maj, dev_min, inode, - path[0] ? " " : "", path); + path[0] ? " " : "", path); } } |