ia64/xen-unstable

changeset 6191:430ce2bade9b

Trivial fixes for a couple of xenlinux compile warnings.

Signed-off-by: <andrew.warfield@cl.cam.ac.uk>
author akw27@arcadians.cl.cam.ac.uk
date Mon Aug 15 13:50:39 2005 +0000 (2005-08-15)
parents 4ec947baae75
children 35f3f9424c93
files linux-2.6-xen-sparse/arch/xen/kernel/reboot.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Mon Aug 15 13:16:04 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Mon Aug 15 13:50:39 2005 +0000
     1.3 @@ -15,6 +15,7 @@
     1.4  #include <asm-xen/linux-public/suspend.h>
     1.5  #include <asm-xen/queues.h>
     1.6  #include <asm-xen/xenbus.h>
     1.7 +#include <asm-xen/ctrl_if.h>
     1.8  
     1.9  #define SHUTDOWN_INVALID  -1
    1.10  #define SHUTDOWN_POWEROFF  0
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Mon Aug 15 13:16:04 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Mon Aug 15 13:50:39 2005 +0000
     2.3 @@ -386,7 +386,10 @@ static void network_tx_buf_gc(struct net
     2.4          mb();
     2.5      } while (prod != np->tx->resp_prod);
     2.6  
     2.7 +#ifdef CONFIG_XEN_NETDEV_GRANT_TX
     2.8    out: 
     2.9 +#endif
    2.10 +
    2.11      if (np->tx_full && ((np->tx->req_prod - prod) < NETIF_TX_RING_SIZE)) {
    2.12          np->tx_full = 0;
    2.13          if (np->user_state == UST_OPEN)