History

Merge branches 'iommu/fixes', 'arm/msm', 'arm/tegra', 'arm/mediatek', 'x86/vt-d', 'x86/amd', 'hyper-v' and 'core' into next

Joerg Roedel committed 7 years ago

Commit d05e4c88 parents cffaaf0 ba93c35 7072230 a947a45 48739af 5f226da 32d5860 18b3af42002 files · +21840 −11614Browse files

Showing the changes to include/uapi/linux (10 of 2002 files). Show all

Unified · Split

10 files
  1. include/uapi/linux/android/binderfs.h +5 −5
  2. include/uapi/linux/audit.h +2 −0
  3. include/uapi/linux/blkzoned.h +1 −0
  4. include/uapi/linux/in.h +1 −1
  5. include/uapi/linux/inet_diag.h +11 −5
  6. include/uapi/linux/input.h +5 −1
  7. include/uapi/linux/pci_regs.h +2 −0
  8. include/uapi/linux/ptp_clock.h +1 −1
  9. include/uapi/linux/virtio_config.h +6 −0
  10. include/uapi/linux/virtio_ring.h +0 −10
include/uapi/linux/android/binderfs.hrenamed from include/uapi/linux/android/binder_ctl.h+5−5
@@ -4,8 +4,8 @@ · 3 unmodified lines
44 *
55 */
66
7−#ifndef _UAPI_LINUX_BINDER_CTL_H
8−#define _UAPI_LINUX_BINDER_CTL_H
7+#ifndef _UAPI_LINUX_BINDERFS_H
8+#define _UAPI_LINUX_BINDERFS_H
99
1010 #include <linux/android/binder.h>
1111 #include <linux/types.h>
@@ -22,8 +22,8 @@ · 10 unmodified lines
2222 */
2323 struct binderfs_device {
2424 char name[BINDERFS_MAX_NAME + 1];
25− __u8 major;
26− __u8 minor;
25+ __u32 major;
26+ __u32 minor;
2727 };
2828
2929 /**
@@ -31,5 +31,5 @@ struct binderfs_device { · 1 unmodified line
3131 */
3232 #define BINDER_CTL_ADD _IOWR('b', 1, struct binderfs_device)
3333
34−#endif /* _UAPI_LINUX_BINDER_CTL_H */
34+#endif /* _UAPI_LINUX_BINDERFS_H */
3535
include/uapi/linux/audit.h+2−0
@@ -400,6 +400,8 @@ enum { · 399 unmodified lines
400400 /* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */
401401 #define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT)
402402 #define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
403+#define AUDIT_ARCH_RISCV32 (EM_RISCV|__AUDIT_ARCH_LE)
404+#define AUDIT_ARCH_RISCV64 (EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
403405 #define AUDIT_ARCH_S390 (EM_S390)
404406 #define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT)
405407 #define AUDIT_ARCH_SH (EM_SH)
include/uapi/linux/blkzoned.h+1−0
@@ -138,6 +138,7 @@ struct blk_zone_range { · 137 unmodified lines
138138 * @BLKRESETZONE: Reset the write pointer of the zones in the specified
139139 * sector range. The sector range must be zone aligned.
140140 * @BLKGETZONESZ: Get the device zone size in number of 512 B sectors.
141+ * @BLKGETNRZONES: Get the total number of zones of the device.
141142 */
142143 #define BLKREPORTZONE _IOWR(0x12, 130, struct blk_zone_report)
143144 #define BLKRESETZONE _IOW(0x12, 131, struct blk_zone_range)
include/uapi/linux/in.h+1−1
@@ -268,7 +268,7 @@ struct sockaddr_in { · 267 unmodified lines
268268 #define IN_MULTICAST(a) IN_CLASSD(a)
269269 #define IN_MULTICAST_NET 0xe0000000
270270
271−#define IN_BADCLASS(a) ((((long int) (a) ) == 0xffffffff)
271+#define IN_BADCLASS(a) (((long int) (a) ) == (long int)0xffffffff)
272272 #define IN_EXPERIMENTAL(a) IN_BADCLASS((a))
273273
274274 #define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000)
include/uapi/linux/inet_diag.h+11−5
@@ -137,15 +137,21 @@ enum { · 136 unmodified lines
137137 INET_DIAG_TCLASS,
138138 INET_DIAG_SKMEMINFO,
139139 INET_DIAG_SHUTDOWN,
140− INET_DIAG_DCTCPINFO,
141− INET_DIAG_PROTOCOL, /* response attribute only */
140+
141+ /*
142+ * Next extenstions cannot be requested in struct inet_diag_req_v2:
143+ * its field idiag_ext has only 8 bits.
144+ */
145+
146+ INET_DIAG_DCTCPINFO, /* request as INET_DIAG_VEGASINFO */
147+ INET_DIAG_PROTOCOL, /* response attribute only */
142148 INET_DIAG_SKV6ONLY,
143149 INET_DIAG_LOCALS,
144150 INET_DIAG_PEERS,
145151 INET_DIAG_PAD,
146− INET_DIAG_MARK,
147− INET_DIAG_BBRINFO,
148− INET_DIAG_CLASS_ID,
152+ INET_DIAG_MARK, /* only with CAP_NET_ADMIN */
153+ INET_DIAG_BBRINFO, /* request as INET_DIAG_VEGASINFO */
154+ INET_DIAG_CLASS_ID, /* request as INET_DIAG_TCLASS */
149155 INET_DIAG_MD5SIG,
150156 __INET_DIAG_MAX,
151157 };
include/uapi/linux/input.h+5−1
@@ -26,13 +26,17 @@ · 25 unmodified lines
2626 */
2727
2828 struct input_event {
29−#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL)
29+#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__)
3030 struct timeval time;
3131 #define input_event_sec time.tv_sec
3232 #define input_event_usec time.tv_usec
3333 #else
3434 __kernel_ulong_t __sec;
35+#if defined(__sparc__) && defined(__arch64__)
36+ unsigned int __usec;
37+#else
3538 __kernel_ulong_t __usec;
39+#endif
3640 #define input_event_sec __sec
3741 #define input_event_usec __usec
3842 #endif
include/uapi/linux/pci_regs.h+2−0
@@ -866,6 +866,7 @@ · 865 unmodified lines
866866 #define PCI_ATS_CAP 0x04 /* ATS Capability Register */
867867 #define PCI_ATS_CAP_QDEP(x) ((x) & 0x1f) /* Invalidate Queue Depth */
868868 #define PCI_ATS_MAX_QDEP 32 /* Max Invalidate Queue Depth */
869+#define PCI_ATS_CAP_PAGE_ALIGNED 0x0020 /* Page Aligned Request */
869870 #define PCI_ATS_CTRL 0x06 /* ATS Control Register */
870871 #define PCI_ATS_CTRL_ENABLE 0x8000 /* ATS Enable */
871872 #define PCI_ATS_CTRL_STU(x) ((x) & 0x1f) /* Smallest Translation Unit */
@@ -880,6 +881,7 @@ · 8 unmodified lines
880881 #define PCI_PRI_STATUS_RF 0x001 /* Response Failure */
881882 #define PCI_PRI_STATUS_UPRGI 0x002 /* Unexpected PRG index */
882883 #define PCI_PRI_STATUS_STOPPED 0x100 /* PRI Stopped */
884+#define PCI_PRI_STATUS_PASID 0x8000 /* PRG Response PASID Required */
883885 #define PCI_PRI_MAX_REQ 0x08 /* PRI max reqs supported */
884886 #define PCI_PRI_ALLOC_REQ 0x0c /* PRI max reqs allowed */
885887 #define PCI_EXT_CAP_PRI_SIZEOF 16
include/uapi/linux/ptp_clock.h+1−1
@@ -147,7 +147,7 @@ struct ptp_pin_desc { · 146 unmodified lines
147147 #define PTP_SYS_OFFSET_PRECISE \
148148 _IOWR(PTP_CLK_MAGIC, 8, struct ptp_sys_offset_precise)
149149 #define PTP_SYS_OFFSET_EXTENDED \
150− _IOW(PTP_CLK_MAGIC, 9, struct ptp_sys_offset_extended)
150+ _IOWR(PTP_CLK_MAGIC, 9, struct ptp_sys_offset_extended)
151151
152152 struct ptp_extts_event {
153153 struct ptp_clock_time t; /* Time event occured. */
include/uapi/linux/virtio_config.h+6−0
@@ -78,6 +78,12 @@ · 77 unmodified lines
7878 /* This feature indicates support for the packed virtqueue layout. */
7979 #define VIRTIO_F_RING_PACKED 34
8080
81+/*
82+ * This feature indicates that memory accesses by the driver and the
83+ * device are ordered in a way described by the platform.
84+ */
85+#define VIRTIO_F_ORDER_PLATFORM 36
86+
8187 /*
8288 * Does the device support Single Root I/O Virtualization?
8389 */
include/uapi/linux/virtio_ring.h+0−10
@@ -213,14 +213,4 @@ struct vring_packed_desc { · 212 unmodified lines
213213 __le16 flags;
214214 };
215215
216−struct vring_packed {
217− unsigned int num;
218−
219− struct vring_packed_desc *desc;
220−
221− struct vring_packed_desc_event *driver;
222−
223− struct vring_packed_desc_event *device;
224−};
225−
226216 #endif /* _UAPI_LINUX_VIRTIO_RING_H */

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