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 /bsd-user/qemu.h | |
| 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 'bsd-user/qemu.h')
| -rw-r--r-- | bsd-user/qemu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index e343894ab1..1ba2d083d1 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -323,7 +323,7 @@ abi_long copy_from_user(void *hptr, abi_ulong gaddr, size_t len); abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len); /* Functions for accessing guest memory. The tget and tput functions - read/write single values, byteswapping as neccessary. The lock_user + read/write single values, byteswapping as necessary. The lock_user gets a pointer to a contiguous area of guest memory, but does not perform and byteswapping. lock_user may return either a pointer to the guest memory, or a temporary buffer. */ |