Linux 4.12-rc3 Daniel has requested this for some drm-intel-next work.
Showing the changes to include/uapi (3 of 647 files). Show all
Unified · Split
| @@ -132,6 +132,13 @@ enum bpf_attach_type { · 131 unmodified lines | |||
| 132 | */ | 132 | */ |
| 133 | #define BPF_F_ALLOW_OVERRIDE (1U << 0) | 133 | #define BPF_F_ALLOW_OVERRIDE (1U << 0) |
| 134 | 134 | ||
| 135 | /* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the | ||
| 136 | * verifier will perform strict alignment checking as if the kernel | ||
| 137 | * has been built with CONFIG_EFFICIENT_UNALIGNED_ACCESS not set, | ||
| 138 | * and NET_IP_ALIGN defined to 2. | ||
| 139 | */ | ||
| 140 | #define BPF_F_STRICT_ALIGNMENT (1U << 0) | ||
| 141 | |||
| 135 | #define BPF_PSEUDO_MAP_FD 1 | 142 | #define BPF_PSEUDO_MAP_FD 1 |
| 136 | 143 | ||
| 137 | /* flags for BPF_MAP_UPDATE_ELEM command */ | 144 | /* flags for BPF_MAP_UPDATE_ELEM command */ |
| @@ -177,6 +184,7 @@ union bpf_attr { · 39 unmodified lines | |||
| 177 | __u32 log_size; /* size of user buffer */ | 184 | __u32 log_size; /* size of user buffer */ |
| 178 | __aligned_u64 log_buf; /* user supplied buffer */ | 185 | __aligned_u64 log_buf; /* user supplied buffer */ |
| 179 | __u32 kern_version; /* checked when prog_type=kprobe */ | 186 | __u32 kern_version; /* checked when prog_type=kprobe */ |
| 187 | __u32 prog_flags; | ||
| 180 | }; | 188 | }; |
| 181 | 189 | ||
| 182 | struct { /* anonymous struct used by BPF_OBJ_* commands */ | 190 | struct { /* anonymous struct used by BPF_OBJ_* commands */ |
| @@ -888,9 +888,18 @@ enum { · 887 unmodified lines | |||
| 888 | /* XDP section */ | 888 | /* XDP section */ |
| 889 | 889 | ||
| 890 | #define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0) | 890 | #define XDP_FLAGS_UPDATE_IF_NOEXIST (1U << 0) |
| 891 | #define XDP_FLAGS_SKB_MODE (2U << 0) | 891 | #define XDP_FLAGS_SKB_MODE (1U << 1) |
| 892 | #define XDP_FLAGS_DRV_MODE (1U << 2) | ||
| 892 | #define XDP_FLAGS_MASK (XDP_FLAGS_UPDATE_IF_NOEXIST | \ | 893 | #define XDP_FLAGS_MASK (XDP_FLAGS_UPDATE_IF_NOEXIST | \ |
| 893 | XDP_FLAGS_SKB_MODE) | 894 | XDP_FLAGS_SKB_MODE | \ |
| 895 | XDP_FLAGS_DRV_MODE) | ||
| 896 | |||
| 897 | /* These are stored into IFLA_XDP_ATTACHED on dump. */ | ||
| 898 | enum { | ||
| 899 | XDP_ATTACHED_NONE = 0, | ||
| 900 | XDP_ATTACHED_DRV, | ||
| 901 | XDP_ATTACHED_SKB, | ||
| 902 | }; | ||
| 894 | 903 | ||
| 895 | enum { | 904 | enum { |
| 896 | IFLA_XDP_UNSPEC, | 905 | IFLA_XDP_UNSPEC, |
| @@ -22,6 +22,9 @@ · 21 unmodified lines | |||
| 22 | */ | 22 | */ |
| 23 | #define USB_MAXCHILDREN 31 | 23 | #define USB_MAXCHILDREN 31 |
| 24 | 24 | ||
| 25 | /* See USB 3.1 spec Table 10-5 */ | ||
| 26 | #define USB_SS_MAXPORTS 15 | ||
| 27 | |||
| 25 | /* | 28 | /* |
| 26 | * Hub request types | 29 | * Hub request types |
| 27 | */ | 30 | */ |