path: root/drivers
diff options
authorLinus Torvalds <>2021-06-26 09:50:10 -0700
committerLinus Torvalds <>2021-06-26 09:50:10 -0700
commit625acffd7ae2c52898d249e6c5c39f348db0d8df (patch)
treeaf448a062513dd41e0a223af859ed081ea301300 /drivers
parentb7050b242430f3170e0b57f5f55136e44cb8dc66 (diff)
parent67147e96a332b56c7206238162771d82467f86c0 (diff)
Merge tag 's390-5.13-5' of git://
Pull s390 fixes from Vasily Gorbik: - Fix a couple of late pt_regs flags handling findings of conversion to generic entry. - Fix potential register clobbering in stack switch helper. - Fix thread/group masks for offline cpus. - Fix cleanup of mdev resources when remove callback is invoked in vfio-ap code. * tag 's390-5.13-5' of git:// s390/stack: fix possible register corruption with stack switch helper s390/topology: clear thread/group maps for offline cpus s390/vfio-ap: clean up mdev resources when remove callback invoked s390: clear pt_regs::flags on irq entry s390: fix system call restart with multiple signals
Diffstat (limited to 'drivers')
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index b2c7e10dfdcd..122c85c22469 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -366,16 +366,6 @@ static int vfio_ap_mdev_remove(struct mdev_device *mdev)
struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev);
- /*
- * If the KVM pointer is in flux or the guest is running, disallow
- * un-assignment of control domain.
- */
- if (matrix_mdev->kvm_busy || matrix_mdev->kvm) {
- mutex_unlock(&matrix_dev->lock);
- return -EBUSY;
- }