ia64/xen-unstable

changeset 1361:34951071caf8

bitkeeper revision 1.898 (40a0f751d2AKlZwLDmziSUD0qn1sfw)

xenolinux CONFIG_MAGIC_SYSRQ=y
cleanups
author iap10@labyrinth.cl.cam.ac.uk
date Tue May 11 15:54:57 2004 +0000 (2004-05-11)
parents 0fab6364d23b
children 5d4e9fe26885
files xen/arch/i386/traps.c xenolinux-2.4.26-sparse/arch/xen/defconfig xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c
line diff
     1.1 --- a/xen/arch/i386/traps.c	Tue May 11 15:02:26 2004 +0000
     1.2 +++ b/xen/arch/i386/traps.c	Tue May 11 15:54:57 2004 +0000
     1.3 @@ -331,8 +331,6 @@ asmlinkage void do_page_fault(struct pt_
     1.4  
     1.5      __asm__ __volatile__ ("movl %%cr2,%0" : "=r" (addr) : );
     1.6  
     1.7 -//    __sti(); // XXXX This may not be safe??? LDT issues???
     1.8 -
     1.9      perfc_incrc(page_faults);
    1.10  
    1.11      if ( unlikely(addr >= LDT_VIRT_START) && 
     2.1 --- a/xenolinux-2.4.26-sparse/arch/xen/defconfig	Tue May 11 15:02:26 2004 +0000
     2.2 +++ b/xenolinux-2.4.26-sparse/arch/xen/defconfig	Tue May 11 15:54:57 2004 +0000
     2.3 @@ -438,7 +438,7 @@ CONFIG_DEBUG_KERNEL=y
     2.4  # CONFIG_DEBUG_HIGHMEM is not set
     2.5  # CONFIG_DEBUG_SLAB is not set
     2.6  # CONFIG_DEBUG_IOVIRT is not set
     2.7 -# CONFIG_MAGIC_SYSRQ is not set
     2.8 +CONFIG_MAGIC_SYSRQ=y
     2.9  # CONFIG_DEBUG_SPINLOCK is not set
    2.10  # CONFIG_DEBUG_BUGVERBOSE is not set
    2.11  CONFIG_KALLSYMS=y
     3.1 --- a/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c	Tue May 11 15:02:26 2004 +0000
     3.2 +++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c	Tue May 11 15:54:57 2004 +0000
     3.3 @@ -373,7 +373,10 @@ static inline void _network_interrupt(st
     3.4          {
     3.5              /* Gate this error. We get a (valid) slew of them on suspend. */
     3.6              if ( np->state == STATE_ACTIVE )
     3.7 -                printk(KERN_ALERT "bad buffer on RX ring!(%d)\n", rx->status);
     3.8 +            {
     3.9 +	        /* With live migrate, we even get these...  Disable for now. */
    3.10 +                // printk(KERN_ALERT "bad buffer on RX ring!(%d)\n", rx->status);
    3.11 +            }
    3.12              dev_kfree_skb_any(skb);
    3.13              continue;
    3.14          }