diff options
| author | Peter Maydell | 2019-05-24 13:47:49 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-05-24 13:47:49 +0200 |
| commit | a7b21f6762a2d6ec08106d8a7ccb11829914523f (patch) | |
| tree | 7d74340fae502fa6a9d6e5218275d766e50274b9 /linux-user/qemu.h | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190524-pull-request' ... (diff) | |
| parent | linux-user: Pass through nanosecond timestamp components for stat syscalls (diff) | |
| download | qemu-a7b21f6762a2d6ec08106d8a7ccb11829914523f.tar.gz qemu-a7b21f6762a2d6ec08106d8a7ccb11829914523f.tar.xz qemu-a7b21f6762a2d6ec08106d8a7ccb11829914523f.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.1-pull-request' into staging
Add /proc/hardware and /proc/cpuinfo,
update SIOCXXX ioctls,
fix shmat emulation,
add nanoseconds in stat,
init field fp_abi on mips
# gpg: Signature made Fri 24 May 2019 12:24:36 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-4.1-pull-request:
linux-user: Pass through nanosecond timestamp components for stat syscalls
linux-user: Align mmap_find_vma to host page size
linux-user: Fix shmat emulation by honoring host SHMLBA
linux-user: Sanitize interp_info and, for mips only, init field fp_abi
linux-user: Add support for SIOC<G|S>IFPFLAGS ioctls for all targets
linux-user: Add support for SIOCSPGRP ioctl for all targets
linux-user: Fix support for SIOCATMARK and SIOCGPGRP ioctls for xtensa
linux-user: add pseudo /proc/hardware for m68k
linux-user: add pseudo /proc/cpuinfo for sparc
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/qemu.h')
| -rw-r--r-- | linux-user/qemu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index ef400cb78a..82d33d7e93 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -443,7 +443,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, abi_ulong new_addr); extern unsigned long last_brk; extern abi_ulong mmap_next_start; -abi_ulong mmap_find_vma(abi_ulong, abi_ulong); +abi_ulong mmap_find_vma(abi_ulong, abi_ulong, abi_ulong); void mmap_fork_start(void); void mmap_fork_end(int child); |