diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-05-11 15:54:57 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-05-11 15:54:57 +0000 |
| commit | 68f817997c9fc419a76d4c9677e663e63d487e22 (patch) | |
| tree | 7f5b10bd6abc157383a847b9c2e1a0315355d151 /xenolinux-2.4.26-sparse/arch | |
| parent | b9b46efd4f4454835d467a7e82296d3e91097120 (diff) | |
| download | xen-68f817997c9fc419a76d4c9677e663e63d487e22.tar.gz xen-68f817997c9fc419a76d4c9677e663e63d487e22.tar.bz2 xen-68f817997c9fc419a76d4c9677e663e63d487e22.zip | |
bitkeeper revision 1.898 (40a0f751d2AKlZwLDmziSUD0qn1sfw)
xenolinux CONFIG_MAGIC_SYSRQ=y
cleanups
Diffstat (limited to 'xenolinux-2.4.26-sparse/arch')
| -rw-r--r-- | xenolinux-2.4.26-sparse/arch/xen/defconfig | 2 | ||||
| -rw-r--r-- | xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xenolinux-2.4.26-sparse/arch/xen/defconfig b/xenolinux-2.4.26-sparse/arch/xen/defconfig index 013e732c3f..1093519efe 100644 --- a/xenolinux-2.4.26-sparse/arch/xen/defconfig +++ b/xenolinux-2.4.26-sparse/arch/xen/defconfig @@ -438,7 +438,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_IOVIRT is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_KALLSYMS=y diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c index daa8441d7b..a56783932f 100644 --- a/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c +++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c @@ -373,7 +373,10 @@ static inline void _network_interrupt(struct net_device *dev) { /* Gate this error. We get a (valid) slew of them on suspend. */ if ( np->state == STATE_ACTIVE ) - printk(KERN_ALERT "bad buffer on RX ring!(%d)\n", rx->status); + { + /* With live migrate, we even get these... Disable for now. */ + // printk(KERN_ALERT "bad buffer on RX ring!(%d)\n", rx->status); + } dev_kfree_skb_any(skb); continue; } |