Merge 4.0-rc5 into tty-next

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

Greg Kroah-Hartman committed 11 years ago

Commit caa445d2 parents 48d7ff0 bc465aa527 files · +5533 −3842Browse files

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

Unified · Split

2 files

 	__u32 size_max;
 	/* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */
 	__u32 seg_max;
-	/* geometry the device (if VIRTIO_BLK_F_GEOMETRY) */
+	/* geometry of the device (if VIRTIO_BLK_F_GEOMETRY) */
 	struct virtio_blk_geometry {
 		__u16 cylinders;
 		__u8 heads;
 #define VIRTIO_BLK_T_BARRIER	0x80000000
 #endif /* !VIRTIO_BLK_NO_LEGACY */
-/* This is the first element of the read scatter-gather list. */
+/*
+ * This comes first in the read scatter-gather list.
+ * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated,
+ * this is the first element of the read scatter-gather list.
+ */
 struct virtio_blk_outhdr {
 	/* VIRTIO_BLK_T* */
 	__virtio32 type;

 #include <linux/virtio_types.h>
-#define VIRTIO_SCSI_CDB_SIZE   32
+/* Default values of the CDB and sense data size configuration fields */
-#define VIRTIO_SCSI_SENSE_SIZE 96
+#define VIRTIO_SCSI_CDB_DEFAULT_SIZE   32
+#define VIRTIO_SCSI_SENSE_DEFAULT_SIZE 96
+#ifndef VIRTIO_SCSI_CDB_SIZE
+#define VIRTIO_SCSI_CDB_SIZE VIRTIO_SCSI_CDB_DEFAULT_SIZE
+#endif
+#ifndef VIRTIO_SCSI_SENSE_SIZE
+#define VIRTIO_SCSI_SENSE_SIZE VIRTIO_SCSI_SENSE_DEFAULT_SIZE
+#endif
 /* SCSI command request, followed by data-out */
 struct virtio_scsi_cmd_req {

Keyboard shortcuts