Merge commit 'v2.6.36' into kbuild/misc

Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1 files changed, 18 insertions, 0 deletions

diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index fd294c56d571..167720d695ed 100644
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -15,6 +15,9 @@
 #define VIRTIO_BLK_F_BLK_SIZE   6       /* Block size of disk is available*/
 #define VIRTIO_BLK_F_SCSI       7       /* Supports scsi command passthru */
 #define VIRTIO_BLK_F_FLUSH      9       /* Cache flush command support */
+#define VIRTIO_BLK_F_TOPOLOGY   10      /* Topology information is available */
+
+#define VIRTIO_BLK_ID_BYTES     20      /* ID string length */
 
 struct virtio_blk_config {
         /* The capacity (in 512-byte sectors). */
@@ -29,8 +32,20 @@ struct virtio_blk_config {
                 __u8 heads;
                 __u8 sectors;
         } geometry;
+
         /* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */
         __u32 blk_size;
+
+        /* the next 4 entries are guarded by VIRTIO_BLK_F_TOPOLOGY  */
+        /* exponent for physical block per logical block. */
+        __u8 physical_block_exp;
+        /* alignment offset in logical blocks. */
+        __u8 alignment_offset;
+        /* minimum I/O size without performance penalty in logical blocks. */
+        __u16 min_io_size;
+        /* optimal sustained I/O size in logical blocks. */
+        __u32 opt_io_size;
+
 } __attribute__((packed));
 
 /*
@@ -54,6 +69,9 @@ struct virtio_blk_config {
 /* Cache flush command */
 #define VIRTIO_BLK_T_FLUSH      4
 
+/* Get device ID command */
+#define VIRTIO_BLK_T_GET_ID    8
+
 /* Barrier before this op. */
 #define VIRTIO_BLK_T_BARRIER    0x80000000