diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-04 22:22:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-04 22:22:00 -0700 |
| commit | 8e9e0fd78090588a97aa3617950b70bdf49b3642 (patch) | |
| tree | 477c2a2bab8cc5f375f6c93d7d3c5002caab1662 /include/uapi | |
| parent | 758693b4a6d94a0724081578d24f6ba1cc449255 (diff) | |
| parent | 9cc5c789d91e4174298c38cb5c7acafc5910a95d (diff) | |
Merge "Merge remote-tracking branch 'msm4.4/tmp-da9a92f' into msm-4.4"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/fuse.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/libc-compat.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index a08933a58079..8a702e7b3f71 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -359,6 +359,7 @@ enum fuse_opcode { FUSE_FALLOCATE = 43, FUSE_READDIRPLUS = 44, FUSE_RENAME2 = 45, + FUSE_CANONICAL_PATH= 2016, /* CUSE specific operations */ CUSE_INIT = 4096, diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index d5e38c73377c..e4f048ee7043 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -52,7 +52,7 @@ #if defined(__GLIBC__) /* Coordinate with glibc net/if.h header. */ -#if defined(_NET_IF_H) +#if defined(_NET_IF_H) && defined(__USE_MISC) /* GLIBC headers included first so don't define anything * that would already be defined. */ diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 7ac89001d223..686da166aeec 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -397,6 +397,7 @@ struct perf_event_attr { #define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *) #define PERF_EVENT_IOC_ID _IOR('$', 7, __u64 *) #define PERF_EVENT_IOC_SET_BPF _IOW('$', 8, __u32) +#define PERF_EVENT_IOC_SET_DRV_CONFIGS _IOW('$', 10, char *) enum perf_event_ioc_flags { PERF_IOC_FLAG_GROUP = 1U << 0, |