History

Merge branch 'for-4.16/dax' into libnvdimm-for-next

Ross Zwisler committed 8 years ago

Commit d121f072 parents 59858d3 569d0361687 files · +18294 −11206Browse files

Showing the changes to include/uapi/linux (5 of 1687 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/bpf_perf_event.h +2 −3
  2. include/uapi/linux/kvm.h +2 −2
  3. include/uapi/linux/pkt_sched.h +0 −1
  4. include/uapi/linux/rtnetlink.h +1 −0
  5. include/uapi/linux/usb/ch9.h +3 −0
include/uapi/linux/bpf_perf_event.h+2−3
@@ -8,11 +8,10 @@ · 7 unmodified lines
8#ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__8#ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__
9#define _UAPI__LINUX_BPF_PERF_EVENT_H__9#define _UAPI__LINUX_BPF_PERF_EVENT_H__
10 10
11#include <linux/types.h>11#include <asm/bpf_perf_event.h>
12#include <linux/ptrace.h>
13 12
14struct bpf_perf_event_data {13struct bpf_perf_event_data {
15 struct pt_regs regs;14 bpf_user_pt_regs_t regs;
16 __u64 sample_period;15 __u64 sample_period;
17};16};
18 17
include/uapi/linux/kvm.h+2−2
@@ -630,9 +630,9 @@ struct kvm_s390_irq { · 629 unmodified lines
630 630
631struct kvm_s390_irq_state {631struct kvm_s390_irq_state {
632 __u64 buf;632 __u64 buf;
633 __u32 flags;633 __u32 flags; /* will stay unused for compatibility reasons */
634 __u32 len;634 __u32 len;
635 __u32 reserved[4];635 __u32 reserved[4]; /* will stay unused for compatibility reasons */
636};636};
637 637
638/* for KVM_SET_GUEST_DEBUG */638/* for KVM_SET_GUEST_DEBUG */
include/uapi/linux/pkt_sched.h+0−1
@@ -256,7 +256,6 @@ struct tc_red_qopt { · 255 unmodified lines
256#define TC_RED_ECN 1256#define TC_RED_ECN 1
257#define TC_RED_HARDDROP 2257#define TC_RED_HARDDROP 2
258#define TC_RED_ADAPTATIVE 4258#define TC_RED_ADAPTATIVE 4
259#define TC_RED_OFFLOADED 8
260};259};
261 260
262struct tc_red_xstats {261struct tc_red_xstats {
include/uapi/linux/rtnetlink.h+1−0
@@ -557,6 +557,7 @@ enum { · 556 unmodified lines
557 TCA_PAD,557 TCA_PAD,
558 TCA_DUMP_INVISIBLE,558 TCA_DUMP_INVISIBLE,
559 TCA_CHAIN,559 TCA_CHAIN,
560 TCA_HW_OFFLOAD,
560 __TCA_MAX561 __TCA_MAX
561};562};
562 563
include/uapi/linux/usb/ch9.h+3−0
@@ -880,6 +880,8 @@ struct usb_wireless_cap_descriptor { /* Ultra Wide Band */ · 879 unmodified lines
880 __u8 bReserved;880 __u8 bReserved;
881} __attribute__((packed));881} __attribute__((packed));
882 882
883#define USB_DT_USB_WIRELESS_CAP_SIZE 11
884
883/* USB 2.0 Extension descriptor */885/* USB 2.0 Extension descriptor */
884#define USB_CAP_TYPE_EXT 2886#define USB_CAP_TYPE_EXT 2
885 887
@@ -1072,6 +1074,7 @@ struct usb_ptm_cap_descriptor { · 186 unmodified lines
1072 __u8 bDevCapabilityType;1074 __u8 bDevCapabilityType;
1073} __attribute__((packed));1075} __attribute__((packed));
1074 1076
1077#define USB_DT_USB_PTM_ID_SIZE 3
1075/*1078/*
1076 * The size of the descriptor for the Sublink Speed Attribute Count1079 * The size of the descriptor for the Sublink Speed Attribute Count
1077 * (SSAC) specified in bmAttributes[4:0].1080 * (SSAC) specified in bmAttributes[4:0].

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t