blkfront: Use system default scheduler rather than force no-op.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/drivers/xen/blkfront/vbd.c b/drivers/xen/blkfront/vbd.c
index 3fb0958ee21990c24596e6fa5a4de7f67cf2fd29..4c5a93df8a3cad8469cbf52907d948b0695d77c3 100644 (file)
--- a/drivers/xen/blkfront/vbd.c
+++ b/drivers/xen/blkfront/vbd.c
@@ -217,12 +217,6 @@ xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
        if (rq == NULL)
                return -1;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-       elevator_init(rq, "noop");
-#else
-       elevator_init(rq, &elevator_noop);
-#endif
-
        /* Hard sector size and max sectors impersonate the equiv. hardware. */
        blk_queue_hardsect_size(rq, sector_size);
        blk_queue_max_sectors(rq, 512);