History

Merge 4.16-rc6 into tty-next

We want the serial/tty fixes in here as well.

Greg Kroah-Hartman committed 8 years ago

Commit 49581342 parents c4f5287 c698ca5746 files · +7575 −4876Browse files

Showing the changes to include/uapi (7 of 746 files). Show all

Unified · Split

7 files
  1. include/uapi/asm-generic/siginfo.h +2 −2
  2. include/uapi/drm/virtgpu_drm.h +1 −0
  3. include/uapi/linux/blktrace_api.h +1 −1
  4. include/uapi/linux/dvb/dmx.h +35 −0
  5. include/uapi/linux/kvm.h +2 −0
  6. include/uapi/linux/psp-sev.h +1 −1
  7. include/uapi/misc/ocxl.h +17 −0
include/uapi/asm-generic/siginfo.h+2−2
@@ -102,13 +102,13 @@ typedef struct siginfo { · 101 unmodified lines
102 short _addr_lsb; /* LSB of the reported address */102 short _addr_lsb; /* LSB of the reported address */
103 /* used when si_code=SEGV_BNDERR */103 /* used when si_code=SEGV_BNDERR */
104 struct {104 struct {
105 short _dummy_bnd;105 void *_dummy_bnd;
106 void __user *_lower;106 void __user *_lower;
107 void __user *_upper;107 void __user *_upper;
108 } _addr_bnd;108 } _addr_bnd;
109 /* used when si_code=SEGV_PKUERR */109 /* used when si_code=SEGV_PKUERR */
110 struct {110 struct {
111 short _dummy_pkey;111 void *_dummy_pkey;
112 __u32 _pkey;112 __u32 _pkey;
113 } _addr_pkey;113 } _addr_pkey;
114 };114 };
include/uapi/drm/virtgpu_drm.h+1−0
@@ -63,6 +63,7 @@ struct drm_virtgpu_execbuffer { · 62 unmodified lines
63};63};
64 64
65#define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */65#define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */
66#define VIRTGPU_PARAM_CAPSET_QUERY_FIX 2 /* do we have the capset fix */
66 67
67struct drm_virtgpu_getparam {68struct drm_virtgpu_getparam {
68 __u64 param;69 __u64 param;
include/uapi/linux/blktrace_api.h+1−1
@@ -131,7 +131,7 @@ enum { · 130 unmodified lines
131#define BLKTRACE_BDEV_SIZE 32131#define BLKTRACE_BDEV_SIZE 32
132 132
133/*133/*
134 * User setup structure passed with BLKTRACESTART134 * User setup structure passed with BLKTRACESETUP
135 */135 */
136struct blk_user_trace_setup {136struct blk_user_trace_setup {
137 char name[BLKTRACE_BDEV_SIZE]; /* output */137 char name[BLKTRACE_BDEV_SIZE]; /* output */
include/uapi/linux/dvb/dmx.h+35−0
@@ -211,6 +211,32 @@ struct dmx_stc { · 210 unmodified lines
211 __u64 stc;211 __u64 stc;
212};212};
213 213
214/**
215 * enum dmx_buffer_flags - DMX memory-mapped buffer flags
216 *
217 * @DMX_BUFFER_FLAG_HAD_CRC32_DISCARD:
218 * Indicates that the Kernel discarded one or more frames due to wrong
219 * CRC32 checksum.
220 * @DMX_BUFFER_FLAG_TEI:
221 * Indicates that the Kernel has detected a Transport Error indicator
222 * (TEI) on a filtered pid.
223 * @DMX_BUFFER_PKT_COUNTER_MISMATCH:
224 * Indicates that the Kernel has detected a packet counter mismatch
225 * on a filtered pid.
226 * @DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED:
227 * Indicates that the Kernel has detected one or more frame discontinuity.
228 * @DMX_BUFFER_FLAG_DISCONTINUITY_INDICATOR:
229 * Received at least one packet with a frame discontinuity indicator.
230 */
231
232enum dmx_buffer_flags {
233 DMX_BUFFER_FLAG_HAD_CRC32_DISCARD = 1 << 0,
234 DMX_BUFFER_FLAG_TEI = 1 << 1,
235 DMX_BUFFER_PKT_COUNTER_MISMATCH = 1 << 2,
236 DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED = 1 << 3,
237 DMX_BUFFER_FLAG_DISCONTINUITY_INDICATOR = 1 << 4,
238};
239
214/**240/**
215 * struct dmx_buffer - dmx buffer info241 * struct dmx_buffer - dmx buffer info
216 *242 *
@@ -220,15 +246,24 @@ struct dmx_stc { · 3 unmodified lines
220 * offset from the start of the device memory for this plane,246 * offset from the start of the device memory for this plane,
221 * (or a "cookie" that should be passed to mmap() as offset)247 * (or a "cookie" that should be passed to mmap() as offset)
222 * @length: size in bytes of the buffer248 * @length: size in bytes of the buffer
249 * @flags: bit array of buffer flags as defined by &enum dmx_buffer_flags.
250 * Filled only at &DMX_DQBUF.
251 * @count: monotonic counter for filled buffers. Helps to identify
252 * data stream loses. Filled only at &DMX_DQBUF.
223 *253 *
224 * Contains data exchanged by application and driver using one of the streaming254 * Contains data exchanged by application and driver using one of the streaming
225 * I/O methods.255 * I/O methods.
256 *
257 * Please notice that, for &DMX_QBUF, only @index should be filled.
258 * On &DMX_DQBUF calls, all fields will be filled by the Kernel.
226 */259 */
227struct dmx_buffer {260struct dmx_buffer {
228 __u32 index;261 __u32 index;
229 __u32 bytesused;262 __u32 bytesused;
230 __u32 offset;263 __u32 offset;
231 __u32 length;264 __u32 length;
265 __u32 flags;
266 __u32 count;
232};267};
233 268
234/**269/**
include/uapi/linux/kvm.h+2−0
@@ -761,6 +761,7 @@ struct kvm_ppc_resize_hpt { · 760 unmodified lines
761#define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07761#define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07
762#define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08762#define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08
763#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2)763#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2)
764#define KVM_GET_MSR_FEATURE_INDEX_LIST _IOWR(KVMIO, 0x0a, struct kvm_msr_list)
764 765
765/*766/*
766 * Extension capability list.767 * Extension capability list.
@@ -934,6 +935,7 @@ struct kvm_ppc_resize_hpt { · 167 unmodified lines
934#define KVM_CAP_S390_AIS_MIGRATION 150935#define KVM_CAP_S390_AIS_MIGRATION 150
935#define KVM_CAP_PPC_GET_CPU_CHAR 151936#define KVM_CAP_PPC_GET_CPU_CHAR 151
936#define KVM_CAP_S390_BPB 152937#define KVM_CAP_S390_BPB 152
938#define KVM_CAP_GET_MSR_FEATURES 153
937 939
938#ifdef KVM_CAP_IRQ_ROUTING940#ifdef KVM_CAP_IRQ_ROUTING
939 941
include/uapi/linux/psp-sev.h+1−1
@@ -42,7 +42,7 @@ typedef enum { · 41 unmodified lines
42 SEV_RET_INVALID_PLATFORM_STATE,42 SEV_RET_INVALID_PLATFORM_STATE,
43 SEV_RET_INVALID_GUEST_STATE,43 SEV_RET_INVALID_GUEST_STATE,
44 SEV_RET_INAVLID_CONFIG,44 SEV_RET_INAVLID_CONFIG,
45 SEV_RET_INVALID_len,45 SEV_RET_INVALID_LEN,
46 SEV_RET_ALREADY_OWNED,46 SEV_RET_ALREADY_OWNED,
47 SEV_RET_INVALID_CERTIFICATE,47 SEV_RET_INVALID_CERTIFICATE,
48 SEV_RET_POLICY_FAILURE,48 SEV_RET_POLICY_FAILURE,
include/uapi/misc/ocxl.h+17−0
@@ -32,6 +32,22 @@ struct ocxl_ioctl_attach { · 31 unmodified lines
32 __u64 reserved3;32 __u64 reserved3;
33};33};
34 34
35struct ocxl_ioctl_metadata {
36 __u16 version; // struct version, always backwards compatible
37
38 // Version 0 fields
39 __u8 afu_version_major;
40 __u8 afu_version_minor;
41 __u32 pasid; // PASID assigned to the current context
42
43 __u64 pp_mmio_size; // Per PASID MMIO size
44 __u64 global_mmio_size;
45
46 // End version 0 fields
47
48 __u64 reserved[13]; // Total of 16*u64
49};
50
35struct ocxl_ioctl_irq_fd {51struct ocxl_ioctl_irq_fd {
36 __u64 irq_offset;52 __u64 irq_offset;
37 __s32 eventfd;53 __s32 eventfd;
@@ -45,5 +61,6 @@ struct ocxl_ioctl_irq_fd { · 7 unmodified lines
45#define OCXL_IOCTL_IRQ_ALLOC _IOR(OCXL_MAGIC, 0x11, __u64)61#define OCXL_IOCTL_IRQ_ALLOC _IOR(OCXL_MAGIC, 0x11, __u64)
46#define OCXL_IOCTL_IRQ_FREE _IOW(OCXL_MAGIC, 0x12, __u64)62#define OCXL_IOCTL_IRQ_FREE _IOW(OCXL_MAGIC, 0x12, __u64)
47#define OCXL_IOCTL_IRQ_SET_FD _IOW(OCXL_MAGIC, 0x13, struct ocxl_ioctl_irq_fd)63#define OCXL_IOCTL_IRQ_SET_FD _IOW(OCXL_MAGIC, 0x13, struct ocxl_ioctl_irq_fd)
64#define OCXL_IOCTL_GET_METADATA _IOR(OCXL_MAGIC, 0x14, struct ocxl_ioctl_metadata)
48 65
49#endif /* _UAPI_MISC_OCXL_H */66#endif /* _UAPI_MISC_OCXL_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