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

[linux-2.6-block.git] / drivers / s390 / block / dasd_eckd.c

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 180a008d38eaaffbea289e26540d4a38f6f0fb0e..2f16f543079b4f8676162f91de141d731c514ee2 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -4561,9 +4561,9 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
        len_to_track_end = 0;
        /*
         * A tidaw can address 4k of memory, but must not cross page boundaries
-        * We can let the block layer handle this by setting
-        * blk_queue_segment_boundary to page boundaries and
-        * blk_max_segment_size to page size when setting up the request queue.
+        * We can let the block layer handle this by setting seg_boundary_mask
+        * to page boundaries and max_segment_size to page size when setting up
+        * the request queue.
         * For write requests, a TIDAW must not cross track boundaries, because
         * we have to set the CBC flag on the last tidaw for each track.
         */