Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b34920c2 authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Update for kernel headers v4.8.14." am: 0c0f0427 am: 39ce1328 am: 456d9216

am: cfc2ba8e

Change-Id: I68472659a7a76e6014f79999274ae7a0d77a2c5b
parents 6ec17dc8 cfc2ba8e
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -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;