From c1523470f35d1bcfb101868a122fa93165606ab3 Mon Sep 17 00:00:00 2001 From: "akw27@arcadians.cl.cam.ac.uk" Date: Mon, 15 Aug 2005 13:50:39 +0000 Subject: Trivial fixes for a couple of xenlinux compile warnings. Signed-off-by: --- linux-2.6-xen-sparse/arch/xen/kernel/reboot.c | 1 + linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c index 585c94e282..d11eb8987a 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c @@ -15,6 +15,7 @@ #include #include #include +#include #define SHUTDOWN_INVALID -1 #define SHUTDOWN_POWEROFF 0 diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index 742c3fd46c..0c72a408bf 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -386,7 +386,10 @@ static void network_tx_buf_gc(struct net_device *dev) mb(); } while (prod != np->tx->resp_prod); +#ifdef CONFIG_XEN_NETDEV_GRANT_TX out: +#endif + if (np->tx_full && ((np->tx->req_prod - prod) < NETIF_TX_RING_SIZE)) { np->tx_full = 0; if (np->user_state == UST_OPEN) -- cgit v1.2.3