summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris2016-08-24 16:49:18 -0500
committerChristopher Ferris2016-08-26 18:48:18 -0500
commitf83c7923f956328a022cddcfcd2d13d797a22a63 (patch)
tree5e2cc230d68bd45de2e2c9de9d36edf7c0a3fb75 /libsync
parent091b631915c68c801bbded01ac8bb3a7af18436e (diff)
downloadplatform-system-core-f83c7923f956328a022cddcfcd2d13d797a22a63.tar.gz
platform-system-core-f83c7923f956328a022cddcfcd2d13d797a22a63.tar.xz
platform-system-core-f83c7923f956328a022cddcfcd2d13d797a22a63.zip
Update for kernel headers v4.7.2.
The new uapi kernel headers added a new SEGV reason code, so add it to the tombstone code. Update sync.c to include the needed data structures itself. Someone else will be fixing this to work on old versus new kernels. Change-Id: Icb27713ea38a20003c7671a9bca262eebd96099b
Diffstat (limited to 'libsync')
-rw-r--r--libsync/sync.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/libsync/sync.c b/libsync/sync.c
index d73bb111c..169dc3678 100644
--- a/libsync/sync.c
+++ b/libsync/sync.c
@@ -21,13 +21,27 @@
21#include <stdint.h> 21#include <stdint.h>
22#include <string.h> 22#include <string.h>
23 23
24#include <linux/sync.h>
25#include <linux/sw_sync.h> 24#include <linux/sw_sync.h>
26 25
27#include <sys/ioctl.h> 26#include <sys/ioctl.h>
28#include <sys/stat.h> 27#include <sys/stat.h>
29#include <sys/types.h> 28#include <sys/types.h>
30 29
30#include <sync/sync.h>
31
32// The sync code is undergoing a major change. Add enough in to get
33// everything to compile wih the latest uapi headers.
34struct sync_merge_data {
35 int32_t fd2;
36 char name[32];
37 int32_t fence;
38};
39
40#define SYNC_IOC_MAGIC '>'
41#define SYNC_IOC_WAIT _IOW(SYNC_IOC_MAGIC, 0, __s32)
42#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)
44
31int sync_wait(int fd, int timeout) 45int sync_wait(int fd, int timeout)
32{ 46{
33 __s32 to = timeout; 47 __s32 to = timeout;