Skip to content

Commit a22755d

Browse files
committed
Merge: [s390] RHEL9.2 - s390/dasd: Remove DMA alignment
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5169 JIRA: https://issues.redhat.com/browse/RHEL-58207 Tested: by IBM Build-Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=64133004 Conflicts: Code changes necessary to adapt to existing differences to upstream - no functional change Commits: 2a07bb6 s390/dasd: Remove DMA alignment Signed-off-by: Mete Durlu <mdurlu@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 48ad650 + a98d96d commit a22755d

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

drivers/s390/block/dasd_diag.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,6 @@ static void dasd_diag_setup_blk_queue(struct dasd_block *block)
639639
/* With page sized segments each segment can be translated into one idaw/tidaw */
640640
blk_queue_max_segment_size(q, PAGE_SIZE);
641641
blk_queue_segment_boundary(q, PAGE_SIZE - 1);
642-
blk_queue_dma_alignment(q, PAGE_SIZE - 1);
643642
}
644643

645644
static int dasd_diag_pe_handler(struct dasd_device *device,

drivers/s390/block/dasd_eckd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6892,7 +6892,6 @@ static void dasd_eckd_setup_blk_queue(struct dasd_block *block)
68926892
/* With page sized segments each segment can be translated into one idaw/tidaw */
68936893
blk_queue_max_segment_size(q, PAGE_SIZE);
68946894
blk_queue_segment_boundary(q, PAGE_SIZE - 1);
6895-
blk_queue_dma_alignment(q, PAGE_SIZE - 1);
68966895
}
68976896

68986897
static struct ccw_driver dasd_eckd_driver = {

0 commit comments

Comments
 (0)