Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-block.git] / include / scsi / scsi_host.h

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 129001f600fc956685745c61ee9156a524cf6065..19a1c5c48935348e41f5f54235ba894add0542d2 100644 (file)
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -211,7 +211,11 @@ struct scsi_host_template {
         *     up after yourself before returning non-0
         *
         * Status: OPTIONAL
+        *
+        * Note: slave_configure is the legacy version, use device_configure for
+        * all new code.  A driver must never define both.
         */
+       int (* device_configure)(struct scsi_device *, struct queue_limits *lim);
        int (* slave_configure)(struct scsi_device *);
 
        /*
@@ -405,6 +409,8 @@ struct scsi_host_template {
         */
        unsigned int max_segment_size;
 
+       unsigned int dma_alignment;
+
        /*
         * DMA scatter gather segment boundary limit. A segment crossing this
         * boundary will be split in two.
@@ -614,6 +620,7 @@ struct Scsi_Host {
        unsigned int max_sectors;
        unsigned int opt_sectors;
        unsigned int max_segment_size;
+       unsigned int dma_alignment;
        unsigned long dma_boundary;
        unsigned long virt_boundary_mask;
        /*
@@ -665,6 +672,8 @@ struct Scsi_Host {
        /* The transport requires the LUN bits NOT to be stored in CDB[1] */
        unsigned no_scsi2_lun_in_cdb:1;
 
+       unsigned no_highmem:1;
+
        /*
         * Optional work queue to be utilized by the transport
         */