diff options
author | Anthony Liguori | 2011-05-12 15:08:12 +0200 |
---|---|---|
committer | Anthony Liguori | 2011-05-12 15:08:12 +0200 |
commit | 711c21280b2cb56060859cc574221a8bf40f908a (patch) | |
tree | 9f5385c53ac50e613ae34d4165d02460ef993f0f /linux-user/syscall.c | |
parent | Merge remote-tracking branch 'agraf/xen-next' into staging (diff) | |
parent | lsi53c895a: Rename 'sense' to 'status' (diff) | |
download | qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.gz qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.xz qemu-711c21280b2cb56060859cc574221a8bf40f908a.zip |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts:
cpu-all.h
Diffstat (limited to 'linux-user/syscall.c')
-rw-r--r-- | linux-user/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 279cef3cd4..6e7d88ec08 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -287,7 +287,7 @@ static int sys_uname(struct new_utsname *buf) * struct linux kernel uses). */ - bzero(buf, sizeof (*buf)); + memset(buf, 0, sizeof(*buf)); COPY_UTSNAME_FIELD(buf->sysname, uts_buf.sysname); COPY_UTSNAME_FIELD(buf->nodename, uts_buf.nodename); COPY_UTSNAME_FIELD(buf->release, uts_buf.release); |