History

Merge branch 'linus' into perf/core, to pick up fixes

Ingo Molnar committed 9 years ago

Commit 2b95bd72 parents ffa86c2 69eea5a586 files · +7737 −3452Browse files

Showing the changes to include/uapi/linux (2 of 586 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/packet_diag.h +1 −1
  2. include/uapi/linux/userfaultfd.h +1 −4
include/uapi/linux/packet_diag.h+1−1
@@ -64,7 +64,7 @@ struct packet_diag_mclist { · 63 unmodified lines
6464 __u32 pdmc_count;
6565 __u16 pdmc_type;
6666 __u16 pdmc_alen;
67− __u8 pdmc_addr[MAX_ADDR_LEN];
67+ __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */
6868 };
6969
7070 struct packet_diag_ring {
include/uapi/linux/userfaultfd.h+1−4
@@ -18,8 +18,7 @@ · 17 unmodified lines
1818 * means the userland is reading).
1919 */
2020 #define UFFD_API ((__u64)0xAA)
21−#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_EXIT | \
22− UFFD_FEATURE_EVENT_FORK | \
21+#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK | \
2322 UFFD_FEATURE_EVENT_REMAP | \
2423 UFFD_FEATURE_EVENT_REMOVE | \
2524 UFFD_FEATURE_EVENT_UNMAP | \
@@ -113,7 +112,6 @@ struct uffd_msg { · 87 unmodified lines
113112 #define UFFD_EVENT_REMAP 0x14
114113 #define UFFD_EVENT_REMOVE 0x15
115114 #define UFFD_EVENT_UNMAP 0x16
116−#define UFFD_EVENT_EXIT 0x17
117115
118116 /* flags for UFFD_EVENT_PAGEFAULT */
119117 #define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */
@@ -163,7 +161,6 @@ struct uffdio_api { · 43 unmodified lines
163161 #define UFFD_FEATURE_MISSING_HUGETLBFS (1<<4)
164162 #define UFFD_FEATURE_MISSING_SHMEM (1<<5)
165163 #define UFFD_FEATURE_EVENT_UNMAP (1<<6)
166−#define UFFD_FEATURE_EVENT_EXIT (1<<7)
167164 __u64 features;
168165
169166 __u64 ioctls;