3 files changed, 5 insertions, 4 deletions

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 43db3ea15b54..fbeefb68a31f 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -213,7 +213,7 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
          * Only allow the generic SCSI ioctls if the host can support it.
          */
         if (!virtio_has_feature(vblk->vdev, VIRTIO_BLK_F_SCSI))
-                return -ENOIOCTLCMD;
+                return -ENOTTY;
 
         return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);
 }
@@ -360,6 +360,9 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
         blk_queue_max_phys_segments(vblk->disk->queue, vblk->sg_elems-2);
         blk_queue_max_hw_segments(vblk->disk->queue, vblk->sg_elems-2);
 
+        /* No need to bounce any requests */
+        blk_queue_bounce_limit(vblk->disk->queue, BLK_BOUNCE_ANY);
+
         /* No real sector limit. */
         blk_queue_max_sectors(vblk->disk->queue, -1U);
 
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index 9c3138265f8e..01c591923793 100644
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -38,8 +38,6 @@ struct lguest_pages
 #define CHANGED_GDT_TLS         4 /* Actually a subset of CHANGED_GDT */
 #define CHANGED_ALL             3
 
-struct lguest;
-
 struct lg_cpu {
         unsigned int id;
         struct lguest *lg;
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 193c8f0e5cc5..bcec78ffc765 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -669,7 +669,7 @@ static int __init virtio_pci_init(void)
 
         err = pci_register_driver(&virtio_pci_driver);
         if (err)
-                device_unregister(virtio_pci_root);
+                root_device_unregister(virtio_pci_root);
 
         return err;
 }