diff -urpNX linux-2.6.32.7/Documentation/dontdiff linux-2.6.32.7/arch/x86/boot/compressed/piggy.S linux-2.6.32.7-xen-netconsole/arch/x86/boot/compressed/piggy.S --- linux-2.6.32.7/arch/x86/boot/compressed/piggy.S 2010-02-14 09:21:54.000000000 +1100 +++ linux-2.6.32.7-xen-netconsole/arch/x86/boot/compressed/piggy.S 2010-02-14 15:46:52.000000000 +1100 @@ -1,6 +1,6 @@ .section ".rodata.compressed","a",@progbits .globl z_input_len -z_input_len = 2406261 +z_input_len = 2406344 .globl z_output_len z_output_len = 11827328 .globl z_extract_offset diff -urpNX linux-2.6.32.7/Documentation/dontdiff linux-2.6.32.7/arch/x86/boot/zoffset.h linux-2.6.32.7-xen-netconsole/arch/x86/boot/zoffset.h --- linux-2.6.32.7/arch/x86/boot/zoffset.h 2010-02-14 09:21:54.000000000 +1100 +++ linux-2.6.32.7-xen-netconsole/arch/x86/boot/zoffset.h 2010-02-14 15:46:52.000000000 +1100 @@ -3,5 +3,5 @@ #define ZO_startup_32 0x0000000000000000 #define ZO_z_extract_offset 0x0000000000905000 #define ZO_z_extract_offset_negative 0xffffffffff6fb000 -#define ZO_z_input_len 0x000000000024b775 +#define ZO_z_input_len 0x000000000024b7c8 #define ZO_z_output_len 0x0000000000b47880 diff -urpNX linux-2.6.32.7/Documentation/dontdiff linux-2.6.32.7/drivers/net/xen-netfront.c linux-2.6.32.7-xen-netconsole/drivers/net/xen-netfront.c --- linux-2.6.32.7/drivers/net/xen-netfront.c 2009-12-03 14:51:21.000000000 +1100 +++ linux-2.6.32.7-xen-netconsole/drivers/net/xen-netfront.c 2010-02-14 15:51:51.000000000 +1100 @@ -989,6 +989,15 @@ err: return work_done; } +#ifdef CONFIG_NET_POLL_CONTROLLER +static void xennet_netpoll(struct net_device *dev) +{ + struct netfront_info *np = netdev_priv(dev); + + napi_schedule(&np->napi); +} +#endif + static int xennet_change_mtu(struct net_device *dev, int mtu) { int max = xennet_can_sg(dev) ? 65535 - ETH_HLEN : ETH_DATA_LEN; @@ -1113,6 +1122,9 @@ static const struct net_device_ops xenne .ndo_change_mtu = xennet_change_mtu, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = xennet_netpoll, +#endif }; static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev) @@ -1181,6 +1193,9 @@ static struct net_device * __devinit xen np->netdev = netdev; + /* Set MAC to temporary (non-zero) value so that netconsole initialises */ + netdev->dev_addr[ETH_ALEN - 1] = 1; + netif_carrier_off(netdev); return netdev;