openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Update for kernel headers v4.7.2." am: 73d2cc570d am: c4abab8578 

am: 99bb22da1b

Change-Id: I7f4a1e252b2eef6604fcc6f4a97ea60e1dd30238
This commit is contained in:
Christopher Ferris 2016-08-29 19:28:04 +00:00 committed by android-build-merger
parent 5fc94d2ce7 99bb22da1b
commit f1b3b636d3
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debuggerd/tombstone.cpp
View File

@ -135,9 +135,14 @@ static const char* get_sigcode(int signo, int code) {
case SEGV_ACCERR: return "SEGV_ACCERR";
#if defined(SEGV_BNDERR)
case SEGV_BNDERR: return "SEGV_BNDERR";
#endif
#if defined(SEGV_PKUERR)
case SEGV_PKUERR: return "SEGV_PKUERR";
#endif
}
#if defined(SEGV_BNDERR)
#if defined(SEGV_PKUERR)
static_assert(NSIGSEGV == SEGV_PKUERR, "missing SEGV_* si_code");
#elif defined(SEGV_BNDERR)
static_assert(NSIGSEGV == SEGV_BNDERR, "missing SEGV_* si_code");
#else
static_assert(NSIGSEGV == SEGV_ACCERR, "missing SEGV_* si_code");

16
libsync/sync.c
View File

@ -21,13 +21,27 @@
#include <stdint.h>
#include <string.h>
#include <linux/sync.h>
#include <linux/sw_sync.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sync/sync.h>
// The sync code is undergoing a major change. Add enough in to get
// everything to compile wih the latest uapi headers.
struct sync_merge_data {
int32_t fd2;
char name[32];
int32_t fence;
};
#define SYNC_IOC_MAGIC '>'
#define SYNC_IOC_WAIT _IOW(SYNC_IOC_MAGIC, 0, __s32)
#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)
int sync_wait(int fd, int timeout)
{
__s32 to = timeout;