27 lines
969 B
Diff
27 lines
969 B
Diff
# HG changeset patch
|
|
# User Ian Campbell <ian.campbell@xensource.com>
|
|
# Date Wed Oct 25 13:58:30 2006 +0100
|
|
# Node ID db23596992f9388fb776a4518ae638b22ee7c8c2
|
|
# parent: 1c985a2e47eadc66e747443dfa65099e5f1dec86
|
|
[LINUX] PV-on-HVM: The elevator_init prototype changed in 2.6.10
|
|
|
|
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
|
|
Signed-off-by: K. Y. Srinivasan <ksrinivasan@novell.com>
|
|
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
|
|
|
|
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Wed Oct 25 13:58:30 2006 +0100
|
|
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/vbd.c Wed Oct 25 13:58:30 2006 +0100
|
|
@@ -188,7 +188,11 @@ xlvbd_init_blk_queue(struct gendisk *gd,
|
|
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);
|
|
|