diff options
| author | Christopher Ferris <cferris@google.com> | 2016-12-12 17:32:55 -0800 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2016-12-12 18:59:42 -0800 |
| commit | 1514bb4f2f6a238b48092b61e55a8a8909e059cc (patch) | |
| tree | 85c0e569bd036c669b15764d2aef6a8d61955c7f /libsync | |
| parent | b0a15d83191c69f9a1279a09a40929b8b9fa6720 (diff) | |
| download | system_core-1514bb4f2f6a238b48092b61e55a8a8909e059cc.tar.gz system_core-1514bb4f2f6a238b48092b61e55a8a8909e059cc.tar.bz2 system_core-1514bb4f2f6a238b48092b61e55a8a8909e059cc.zip | |
Update for kernel headers v4.8.14.
Update sync.c to include the structurs from sw_sync.h. This uapi
header has been deleted.
Test: Built mips/arm/arm64/x86/x86_64. Built and booted angler.
Change-Id: I2495cb17b35f697fb8a2a00f6633ccb53f78293f
Diffstat (limited to 'libsync')
| -rw-r--r-- | libsync/sync.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libsync/sync.c b/libsync/sync.c index 169dc3678..6281b205c 100644 --- a/libsync/sync.c +++ b/libsync/sync.c @@ -21,8 +21,6 @@ #include <stdint.h> #include <string.h> -#include <linux/sw_sync.h> - #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> @@ -42,6 +40,16 @@ struct sync_merge_data { #define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 1, struct sync_merge_data) #define SYNC_IOC_FENCE_INFO _IOWR(SYNC_IOC_MAGIC, 2, struct sync_fence_info_data) +struct sw_sync_create_fence_data { + __u32 value; + char name[32]; + __s32 fence; +}; + +#define SW_SYNC_IOC_MAGIC 'W' +#define SW_SYNC_IOC_CREATE_FENCE _IOWR(SW_SYNC_IOC_MAGIC, 0, struct sw_sync_create_fence_data) +#define SW_SYNC_IOC_INC _IOW(SW_SYNC_IOC_MAGIC, 1, __u32) + int sync_wait(int fd, int timeout) { __s32 to = timeout; |