summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris2016-12-12 19:32:55 -0600
committerChristopher Ferris2016-12-12 20:59:42 -0600
commit1514bb4f2f6a238b48092b61e55a8a8909e059cc (patch)
tree85c0e569bd036c669b15764d2aef6a8d61955c7f /libsync/sync.c
parentb0a15d83191c69f9a1279a09a40929b8b9fa6720 (diff)
downloadplatform-system-core-1514bb4f2f6a238b48092b61e55a8a8909e059cc.tar.gz
platform-system-core-1514bb4f2f6a238b48092b61e55a8a8909e059cc.tar.xz
platform-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/sync.c')
-rw-r--r--libsync/sync.c12
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 @@
21#include <stdint.h> 21#include <stdint.h>
22#include <string.h> 22#include <string.h>
23 23
24#include <linux/sw_sync.h>
25
26#include <sys/ioctl.h> 24#include <sys/ioctl.h>
27#include <sys/stat.h> 25#include <sys/stat.h>
28#include <sys/types.h> 26#include <sys/types.h>
@@ -42,6 +40,16 @@ struct sync_merge_data {
42#define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 1, struct sync_merge_data) 40#define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 1, struct sync_merge_data)
43#define SYNC_IOC_FENCE_INFO _IOWR(SYNC_IOC_MAGIC, 2, struct sync_fence_info_data) 41#define SYNC_IOC_FENCE_INFO _IOWR(SYNC_IOC_MAGIC, 2, struct sync_fence_info_data)
44 42
43struct sw_sync_create_fence_data {
44 __u32 value;
45 char name[32];
46 __s32 fence;
47};
48
49#define SW_SYNC_IOC_MAGIC 'W'
50#define SW_SYNC_IOC_CREATE_FENCE _IOWR(SW_SYNC_IOC_MAGIC, 0, struct sw_sync_create_fence_data)
51#define SW_SYNC_IOC_INC _IOW(SW_SYNC_IOC_MAGIC, 1, __u32)
52
45int sync_wait(int fd, int timeout) 53int sync_wait(int fd, int timeout)
46{ 54{
47 __s32 to = timeout; 55 __s32 to = timeout;