diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-28 13:34:47 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-28 13:34:47 -0500 |
commit | 1e79a9e3ab96ecf8dbb8b6d237b3ae824bd79074 (patch) | |
tree | 60e5967053f62461b983d0fe45fe5786805c6327 /drivers | |
parent | 29c46979b25d5ca867e9859bfdd088d028739cdf (diff) | |
parent | 99b63f55dc514a357c2ecf25e9aab149879329f0 (diff) | |
download | linux-1e79a9e3ab96ecf8dbb8b6d237b3ae824bd79074.tar.gz linux-1e79a9e3ab96ecf8dbb8b6d237b3ae824bd79074.tar.bz2 linux-1e79a9e3ab96ecf8dbb8b6d237b3ae824bd79074.zip |
Merge tag 'kvm-s390-next-6.2-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
- Second batch of the lazy destroy patches
- First batch of KVM changes for kernel virtual != physical address support
- Removal of a unused function
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/crypto/vfio_ap_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c index 0b4cc8c597ae..205a00105858 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -429,7 +429,7 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q, aqic_gisa.isc = nisc; aqic_gisa.ir = 1; - aqic_gisa.gisa = (uint64_t)gisa >> 4; + aqic_gisa.gisa = virt_to_phys(gisa) >> 4; status = ap_aqic(q->apqn, aqic_gisa, h_nib); switch (status.response_code) { |