[Xen-changelog] Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1280, 2004/08/27 16:14:26+01:00, cl...@fr...

	Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
	into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-26dom0



 blkfront.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


diff -Nru a/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c	2004-08-27 12:01:41 -04:00
+++ b/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c	2004-08-27 12:01:41 -04:00
@@ -32,7 +32,7 @@
 static unsigned int blkif_state = BLKIF_STATE_CLOSED;
 static unsigned int blkif_evtchn, blkif_irq;
 
-static volatile int blkif_control_rsp_valid;
+static int blkif_control_rsp_valid;
 static blkif_response_t blkif_control_rsp;
 
 static blkif_ring_t *blk_ring;