aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-11-12 15:29:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-11-12 15:29:28 -0800
commit04689e749b7ec156291446028a0ce2e685bf3855 (patch)
tree60218b91a2cc65906e691f9a9ff5bd8d5fa02101 /drivers
parent74b60ef779f47629b22200f6568a7cda1cd12c83 (diff)
parentd29b9d7ed76c0b961603ca692b8a562556a20212 (diff)
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fixes from Paolo Bonzini: "Two fixes --- one of them not exactly a one liner, but things are calming down on the KVM front at last" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: Fix uninitialized op->type for some immediate values KVM: s390: virtio_ccw: remove unused variable
Diffstat (limited to 'drivers')
-rw-r--r--drivers/s390/kvm/virtio_ccw.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 6cbe6ef3c889..bda52f18e967 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -888,7 +888,6 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
int i;
struct virtqueue *vq;
- struct virtio_driver *drv;
if (!vcdev)
return;

Privacy Policy