bitkeeper revision 1.898 (40a0f751d2AKlZwLDmziSUD0qn1sfw)

xenolinux CONFIG_MAGIC_SYSRQ=y
cleanups

diff --git a/xen/arch/i386/traps.c b/xen/arch/i386/traps.c
index 97c682a2af6fb6871b170144b2b5217748deab8e..1457617d2937b4d62d363c40615de9dd47093423 100644 (file)
--- a/xen/arch/i386/traps.c
+++ b/xen/arch/i386/traps.c
@@ -331,8 +331,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, long error_code)
 
     __asm__ __volatile__ ("movl %%cr2,%0" : "=r" (addr) : );
 
-//    __sti(); // XXXX This may not be safe??? LDT issues???
-
     perfc_incrc(page_faults);
 
     if ( unlikely(addr >= LDT_VIRT_START) && 

diff --git a/xenolinux-2.4.26-sparse/arch/xen/defconfig b/xenolinux-2.4.26-sparse/arch/xen/defconfig
index 013e732c3fa07e3742c2793edcefd4065781e4ff..1093519efe68ab2fba5f25a6afe767d1046802c9 100644 (file)
--- 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 daa8441d7b2ede877eec01341fd99ae7485d129b..a56783932f5b4455dfcff2bc307479bd1a317f7c 100644 (file)
--- 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;
         }