direct-io.hg

changeset 4477:277a90deda3e

bitkeeper revision 1.1273 (42528455fuYKRPQo9yR7MWkPUH-vRg)

Merge br260@scramble.cl.cam.ac.uk:/usr/groups/xeno/BK/xen-unstable.bk
into br260.wolfson.cam.ac.uk:/share/project/xeno/xen-unstable.bk
author bren@br260.wolfson.cam.ac.uk
date Tue Apr 05 12:28:05 2005 +0000 (2005-04-05)
parents a474e06bc485 9840c24f5803
children 78c506cbdb5f fa593bda762e
files linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6.11-xen-sparse/drivers/xen/console/console.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Tue Apr 05 12:09:43 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Tue Apr 05 12:28:05 2005 +0000
     1.3 @@ -627,8 +627,7 @@ static void dispatch_rw_block_io(blkif_t
     1.4                  (bio_add_page(bio,
     1.5                                virt_to_page(MMAP_VADDR(pending_idx, i)),
     1.6                                seg[i].nsec << 9,
     1.7 -                              seg[i].buf & ~PAGE_MASK) <
     1.8 -                 (seg[i].nsec << 9)) )
     1.9 +                              seg[i].buf & ~PAGE_MASK) == 0) )
    1.10          {
    1.11              bio = biolist[nbio++] = bio_alloc(GFP_KERNEL, nseg-i);
    1.12              if ( unlikely(bio == NULL) )
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/console/console.c	Tue Apr 05 12:09:43 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c	Tue Apr 05 12:28:05 2005 +0000
     2.3 @@ -87,6 +87,8 @@ static int __init xencons_setup(char *st
     2.4          n = simple_strtol( str+3, &q, 10 );
     2.5          if ( q > (str + 3) ) xc_num = n;
     2.6          break;
     2.7 +    default:
     2.8 +        break;
     2.9      }
    2.10  
    2.11      return 1;