History

Merge branch 'for-5.1/nfit/ars' into libnvdimm-for-next

Merge several updates to the ARS implementation. Highlights include: * Support retrieval of short-ARS results if the ARS state is "requires continuation", and even if the "no_init_ars" module parameter is specified. * Allow busy-polling of the kernel ARS state by allowing root to reset the exponential back-off timer. * Filter potentially stale ARS results by tracking query-ARS relative to the previous start-ARS.

Dan Williams committed 7 years ago

Commit 40830142 parents 6fd96ff 78153dd568 files · +5617 −2209Browse files

Showing the changes to include/uapi/linux (2 of 568 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/virtio_config.h +6 −0
  2. include/uapi/linux/virtio_ring.h +0 −10
include/uapi/linux/virtio_config.h+6−0
@@ -78,6 +78,12 @@ · 77 unmodified lines
78/* This feature indicates support for the packed virtqueue layout. */78/* This feature indicates support for the packed virtqueue layout. */
79#define VIRTIO_F_RING_PACKED 3479#define VIRTIO_F_RING_PACKED 34
80 80
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
81/*87/*
82 * Does the device support Single Root I/O Virtualization?88 * Does the device support Single Root I/O Virtualization?
83 */89 */
include/uapi/linux/virtio_ring.h+0−10
@@ -213,14 +213,4 @@ struct vring_packed_desc { · 212 unmodified lines
213 __le16 flags;213 __le16 flags;
214};214};
215 215
216struct 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
226#endif /* _UAPI_LINUX_VIRTIO_RING_H */216#endif /* _UAPI_LINUX_VIRTIO_RING_H */