direct-io.hg

changeset 2280:730cb3f03609

bitkeeper revision 1.1159.1.79 (41238b39tnubrtr-gGsonDj9g_pSjQ)

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 Wed Aug 18 17:00:41 2004 +0000 (2004-08-18)
parents 1419a54e36ca f96771608bc3
children 238feb30380b
files linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c xen/common/dom_mem_ops.c
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c	Wed Aug 18 16:57:36 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/netfront/netfront.c	Wed Aug 18 17:00:41 2004 +0000
     1.3 @@ -285,7 +285,7 @@ static void network_alloc_rx_buffers(str
     1.4      rx_mcl[nr_pfns].args[0] = MEMOP_decrease_reservation;
     1.5      rx_mcl[nr_pfns].args[1] = (unsigned long)rx_pfn_array;
     1.6      rx_mcl[nr_pfns].args[2] = (unsigned long)nr_pfns;
     1.7 -    rx_mcl[nr_pfns].args[3] = 0;
     1.8 +    rx_mcl[nr_pfns].args[3] = DOMID_SELF;
     1.9  
    1.10      /* Zap PTEs and give away pages in one big multicall. */
    1.11      (void)HYPERVISOR_multicall(rx_mcl, nr_pfns+1);
     2.1 --- a/xen/common/dom_mem_ops.c	Wed Aug 18 16:57:36 2004 +0000
     2.2 +++ b/xen/common/dom_mem_ops.c	Wed Aug 18 17:00:41 2004 +0000
     2.3 @@ -98,7 +98,7 @@ long do_dom_mem_op(unsigned int   op,
     2.4      struct domain *d;
     2.5      long           rc;
     2.6  
     2.7 -    d = (domid == DOMID_SELF) ? current : find_domain_by_id(domid);
     2.8 +    d = ( (domid == DOMID_SELF) || (!IS_PRIV(current)) ) ? current : find_domain_by_id(domid);
     2.9      if ( d == NULL )
    2.10  	return -ESRCH;
    2.11