[Xen-changelog] merge

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 35f3f9424c93e86cec5b2b3b2d2e9fabc8ab2659
# Parent  d4338cc89c2c447c6182b189113eb5a014cbe699
# Parent  430ce2bade9b996535dc19a3797afd269d5fa878
merge

diff -r d4338cc89c2c -r 35f3f9424c93 
linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Mon Aug 15 14:52:32 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Mon Aug 15 14:52:59 2005
@@ -15,6 +15,7 @@
 #include <asm-xen/linux-public/suspend.h>
 #include <asm-xen/queues.h>
 #include <asm-xen/xenbus.h>
+#include <asm-xen/ctrl_if.h>
 
 #define SHUTDOWN_INVALID  -1
 #define SHUTDOWN_POWEROFF  0
diff -r d4338cc89c2c -r 35f3f9424c93 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Mon Aug 15 
14:52:32 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Mon Aug 15 
14:52:59 2005
@@ -386,7 +386,10 @@
         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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog