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/linux (4 of 746 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/blktrace_api.h +1 −1
  2. include/uapi/linux/dvb/dmx.h +35 −0
  3. include/uapi/linux/kvm.h +2 −0
  4. include/uapi/linux/psp-sev.h +1 −1
include/uapi/linux/blktrace_api.h+1−1
@@ -131,7 +131,7 @@ enum { · 130 unmodified lines
131131 #define BLKTRACE_BDEV_SIZE 32
132132
133133 /*
134− * User setup structure passed with BLKTRACESTART
134+ * User setup structure passed with BLKTRACESETUP
135135 */
136136 struct blk_user_trace_setup {
137137 char name[BLKTRACE_BDEV_SIZE]; /* output */
include/uapi/linux/dvb/dmx.h+35−0
@@ -211,6 +211,32 @@ struct dmx_stc { · 210 unmodified lines
211211 __u64 stc;
212212 };
213213
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+
232+enum 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+
214240 /**
215241 * struct dmx_buffer - dmx buffer info
216242 *
@@ -220,15 +246,24 @@ struct dmx_stc { · 3 unmodified lines
220246 * offset from the start of the device memory for this plane,
221247 * (or a "cookie" that should be passed to mmap() as offset)
222248 * @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.
223253 *
224254 * Contains data exchanged by application and driver using one of the streaming
225255 * 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.
226259 */
227260 struct dmx_buffer {
228261 __u32 index;
229262 __u32 bytesused;
230263 __u32 offset;
231264 __u32 length;
265+ __u32 flags;
266+ __u32 count;
232267 };
233268
234269 /**
include/uapi/linux/kvm.h+2−0
@@ -761,6 +761,7 @@ struct kvm_ppc_resize_hpt { · 760 unmodified lines
761761 #define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07
762762 #define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08
763763 #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)
764765
765766 /*
766767 * Extension capability list.
@@ -934,6 +935,7 @@ struct kvm_ppc_resize_hpt { · 167 unmodified lines
934935 #define KVM_CAP_S390_AIS_MIGRATION 150
935936 #define KVM_CAP_PPC_GET_CPU_CHAR 151
936937 #define KVM_CAP_S390_BPB 152
938+#define KVM_CAP_GET_MSR_FEATURES 153
937939
938940 #ifdef KVM_CAP_IRQ_ROUTING
939941
include/uapi/linux/psp-sev.h+1−1
@@ -42,7 +42,7 @@ typedef enum { · 41 unmodified lines
4242 SEV_RET_INVALID_PLATFORM_STATE,
4343 SEV_RET_INVALID_GUEST_STATE,
4444 SEV_RET_INAVLID_CONFIG,
45− SEV_RET_INVALID_len,
45+ SEV_RET_INVALID_LEN,
4646 SEV_RET_ALREADY_OWNED,
4747 SEV_RET_INVALID_CERTIFICATE,
4848 SEV_RET_POLICY_FAILURE,