From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 12 Oct 2009 11:57:55 +0000 (+0100)
Subject: blkfront: Use system default scheduler rather than force no-op.
X-Git-Tag: xen-3.4.2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b1f5a61528472478f0d542e5f9a53d7b378f6071;p=legacy%2Flinux-2.6.18-xen.git

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 3fb0958e..4c5a93df 100644
--- 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);