From d6088036b6de1d14577ff0ce4d99c95141d206a9 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 7 Jan 2013 15:51:52 +0100 Subject: [PATCH] --- yaml --- r: 356835 b: refs/heads/master c: b26ba22bb4f12289f9d5eb878c490e674934a197 h: refs/heads/master i: 356833: 16c50a889be8f377615165fb06c8482f16f78e5f 356831: 27076e9aedd680025d6f24d74a06664bd343f00a v: v3 --- [refs] | 2 +- trunk/drivers/s390/kvm/virtio_ccw.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 000e80e73dd4..046b53197487 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73fa21ea4fc662a2e8e85f84c4ca3fcb55fa4da2 +refs/heads/master: b26ba22bb4f12289f9d5eb878c490e674934a197 diff --git a/trunk/drivers/s390/kvm/virtio_ccw.c b/trunk/drivers/s390/kvm/virtio_ccw.c index 70419a75d0e0..2edd94af131c 100644 --- a/trunk/drivers/s390/kvm/virtio_ccw.c +++ b/trunk/drivers/s390/kvm/virtio_ccw.c @@ -132,11 +132,14 @@ static int ccw_io_helper(struct virtio_ccw_device *vcdev, unsigned long flags; int flag = intparm & VIRTIO_CCW_INTPARM_MASK; - spin_lock_irqsave(get_ccwdev_lock(vcdev->cdev), flags); - ret = ccw_device_start(vcdev->cdev, ccw, intparm, 0, 0); - if (!ret) - vcdev->curr_io |= flag; - spin_unlock_irqrestore(get_ccwdev_lock(vcdev->cdev), flags); + do { + spin_lock_irqsave(get_ccwdev_lock(vcdev->cdev), flags); + ret = ccw_device_start(vcdev->cdev, ccw, intparm, 0, 0); + if (!ret) + vcdev->curr_io |= flag; + spin_unlock_irqrestore(get_ccwdev_lock(vcdev->cdev), flags); + cpu_relax(); + } while (ret == -EBUSY); wait_event(vcdev->wait_q, doing_io(vcdev, flag) == 0); return ret ? ret : vcdev->err; }