diff options
| author | Roman Kiryanov <rkir@google.com> | 2019-09-09 15:23:32 -0700 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2019-09-13 12:23:11 -0700 |
| commit | edc5795b6d8f7a1c2266107a81e867cfc61c2a10 (patch) | |
| tree | 83cd7fcc620cece2b759d762b2ebe77bc119a6df | |
| parent | ffcbc6214458f6ee447a51beabcf50425d024f2d (diff) | |
| download | goldfish-edc5795b6d8f7a1c2266107a81e867cfc61c2a10.tar.gz | |
Split wait_offset to version and wait_fd fieldsandroid-goldfish-4.14-gchips
wait_offset (u64) was not used anyway. We need some
kind of signaling that a long running operation
finished on the host side. wait_fd (created by eventfd)
could be used for this purpose.
Bug: 140260110
Test: build
Change-Id: I1c993b19aaa610255f9abec3d87d6865d971585d
Signed-off-by: Roman Kiryanov <rkir@google.com>
| -rw-r--r-- | drivers/misc/goldfish_address_space.c | 1 | ||||
| -rw-r--r-- | include/uapi/linux/goldfish/goldfish_address_space.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/goldfish_address_space.c b/drivers/misc/goldfish_address_space.c index 41b52d2ee917..67f3b9f2b0d7 100644 --- a/drivers/misc/goldfish_address_space.c +++ b/drivers/misc/goldfish_address_space.c @@ -576,7 +576,6 @@ as_ioctl_ping_impl(struct goldfish_address_space_ping *ping_info, // Convert to phys addrs ping_info->offset += state->address_area_phys_address; - ping_info->wait_offset += state->address_area_phys_address; mutex_lock(&state->registers_lock); as_ping_impl(state, handle); diff --git a/include/uapi/linux/goldfish/goldfish_address_space.h b/include/uapi/linux/goldfish/goldfish_address_space.h index c54008905096..e997eb4002a8 100644 --- a/include/uapi/linux/goldfish/goldfish_address_space.h +++ b/include/uapi/linux/goldfish/goldfish_address_space.h @@ -16,7 +16,8 @@ struct goldfish_address_space_ping { __u64 offset; __u64 size; __u64 metadata; - __u64 wait_offset; + __u32 version; + __u32 wait_fd; __u32 wait_flags; __u32 direction; }; |