direct-io.hg

changeset 6160:879ff416adcc

Build fixes for grant tables.

Signed-off-by: Steven Hand <steven@xensource.com>
author smh22@firebug.cl.cam.ac.uk
date Sun Aug 14 22:56:46 2005 +0000 (2005-08-14)
parents 3076b3cc3048
children b3d76a75ff20 0d454a3405fd
files linux-2.6-xen-sparse/drivers/xen/netback/interface.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Sun Aug 14 22:09:18 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/interface.c	Sun Aug 14 22:56:46 2005 +0000
     1.3 @@ -383,12 +383,6 @@ void netif_connect(netif_be_connect_t *c
     1.4              return;
     1.5          }
     1.6  
     1.7 -            DPRINTK(" Grant table operation failure !\n");
     1.8 -            connect->status = NETIF_BE_STATUS_MAPPING_ERROR;
     1.9 -            vfree(vma->addr);
    1.10 -            return;
    1.11 -        }
    1.12 -
    1.13          netif->rx_shmem_ref    = rx_ref;
    1.14          netif->rx_shmem_handle = handle;
    1.15          netif->rx_shmem_vaddr  = VMALLOC_VMADDR(vma->addr) + PAGE_SIZE;
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Sun Aug 14 22:09:18 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Sun Aug 14 22:56:46 2005 +0000
     2.3 @@ -55,6 +55,8 @@ static DECLARE_TASKLET(net_rx_tasklet, n
     2.4  
     2.5  static struct timer_list net_timer;
     2.6  
     2.7 +#define MAX_PENDING_REQS 256
     2.8 +
     2.9  static struct sk_buff_head rx_queue;
    2.10  static multicall_entry_t rx_mcl[NETIF_RX_RING_SIZE*2+1];
    2.11  static mmu_update_t rx_mmu[NETIF_RX_RING_SIZE];
    2.12 @@ -68,7 +70,6 @@ static unsigned char rx_notify[NR_EVENT_
    2.13  /* Don't currently gate addition of an interface to the tx scheduling list. */
    2.14  #define tx_work_exists(_if) (1)
    2.15  
    2.16 -#define MAX_PENDING_REQS 256
    2.17  static unsigned long mmap_vstart;
    2.18  #define MMAP_VADDR(_req) (mmap_vstart + ((_req) * PAGE_SIZE))
    2.19  
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Sun Aug 14 22:09:18 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Sun Aug 14 22:56:46 2005 +0000
     3.3 @@ -356,7 +356,7 @@ static void network_tx_buf_gc(struct net
     3.4              id  = np->tx->ring[MASK_NETIF_TX_IDX(i)].resp.id;
     3.5              skb = np->tx_skbs[id];
     3.6  #ifdef CONFIG_XEN_NETDEV_GRANT_TX
     3.7 -            if (unlikey(gnttab_query_foreign_access(grant_tx_ref[id]) != 0)) {
     3.8 +            if (unlikely(gnttab_query_foreign_access(grant_tx_ref[id]) != 0)) {
     3.9                  /* other domain is still using this grant - shouldn't happen
    3.10                     but if it does, we'll try to reclaim the grant later */
    3.11                  printk(KERN_ALERT "network_tx_buf_gc: warning -- grant "