diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
commit | d1eec383a8abe348b5ce72df9e96bff3d9039134 (patch) | |
tree | 6ea912eb2d4f2bee8301a04ebf82283805218ebf /drivers/s390/block/dasd_eer.c | |
parent | x86/tsc: Make __use_tsc __ro_after_init (diff) | |
parent | Linux 6.9-rc3 (diff) | |
download | linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.tar.xz linux-d1eec383a8abe348b5ce72df9e96bff3d9039134.zip |
Merge tag 'v6.9-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/s390/block/dasd_eer.c')
-rw-r--r-- | drivers/s390/block/dasd_eer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c index 5064a616e041..194e9e2d9cb8 100644 --- a/drivers/s390/block/dasd_eer.c +++ b/drivers/s390/block/dasd_eer.c @@ -485,7 +485,7 @@ int dasd_eer_enable(struct dasd_device *device) ccw->cmd_code = DASD_ECKD_CCW_SNSS; ccw->count = SNSS_DATA_SIZE; ccw->flags = 0; - ccw->cda = (__u32)virt_to_phys(cqr->data); + ccw->cda = virt_to_dma32(cqr->data); cqr->buildclk = get_tod_clock(); cqr->status = DASD_CQR_FILLED; |