ia64/xen-unstable

changeset 4332:320b9cc5155c

bitkeeper revision 1.1236.43.14 (424466ecgeg-norljKfMh0Tylfkxrg)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-plax
author cl349@firebug.cl.cam.ac.uk
date Fri Mar 25 19:30:52 2005 +0000 (2005-03-25)
parents 1fe76eb5830b 9664916ba37e
children 8a798fbdbb60
files linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap.h linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap_userdev.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap.h	Fri Mar 25 19:06:12 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap.h	Fri Mar 25 19:30:52 2005 +0000
     1.3 @@ -30,6 +30,8 @@
     1.4  
     1.5  /* -------[ debug / pretty printing ]--------------------------------- */
     1.6  
     1.7 +#define PRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
     1.8 +                           __FILE__ , __LINE__ , ## _a )
     1.9  #if 0
    1.10  #define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
    1.11                             __FILE__ , __LINE__ , ## _a )
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap_userdev.c	Fri Mar 25 19:06:12 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap_userdev.c	Fri Mar 25 19:30:52 2005 +0000
     2.3 @@ -299,7 +299,7 @@ int blktap_write_fe_ring(blkif_request_t
     2.4      }
     2.5  
     2.6      if ( RING_FULL(&blktap_ufe_ring) ) {
     2.7 -        DPRINTK("blktap: fe_ring is full, can't add.\n");
     2.8 +        PRINTK("blktap: fe_ring is full, can't add.\n");
     2.9          return 0;
    2.10      }
    2.11  
    2.12 @@ -383,10 +383,9 @@ static int blktap_read_fe_ring(void)
    2.13              zap_page_range(blktap_vma, MMAP_VADDR(ID_TO_IDX(resp_s->id), 0), 
    2.14                      ar->nr_pages << PAGE_SHIFT, NULL);
    2.15              write_resp_to_fe_ring(blkif, resp_s);
    2.16 +            blktap_ufe_ring.rsp_cons = i + 1;
    2.17              kick_fe_domain(blkif);
    2.18          }
    2.19 -        
    2.20 -        blktap_ufe_ring.rsp_cons = i;
    2.21      }
    2.22      return 0;
    2.23  }