ia64/xen-unstable

changeset 2363:2471637f1714

bitkeeper revision 1.1159.53.8 (412f0f0b5LWOmToqbJyP_jlwREcLSg)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Fri Aug 27 10:38:03 2004 +0000 (2004-08-27)
parents d1c52efc1bcd a21eaec2a69a
children 401dcd9a4f0b
files linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c
line diff
     1.1 --- a/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c	Fri Aug 27 10:19:33 2004 +0000
     1.2 +++ b/linux-2.6.8.1-xen-sparse/drivers/xen/blkfront/blkfront.c	Fri Aug 27 10:38:03 2004 +0000
     1.3 @@ -32,7 +32,7 @@ typedef unsigned char byte; /* from linu
     1.4  static unsigned int blkif_state = BLKIF_STATE_CLOSED;
     1.5  static unsigned int blkif_evtchn, blkif_irq;
     1.6  
     1.7 -static volatile int blkif_control_rsp_valid;
     1.8 +static int blkif_control_rsp_valid;
     1.9  static blkif_response_t blkif_control_rsp;
    1.10  
    1.11  static blkif_ring_t *blk_ring;