bitkeeper revision 1.907 (40a6233a_5VzzVMLUF-Lja0yZHdHtQ)

Merge tetris.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into tetris.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xeno.bk

xen/arch/i386/process.c

@@ -128,6 +128,9 @@ void machine_restart(char * __unused)
 #ifdef CONFIG_SMP
     cpuid = GET_APIC_ID(apic_read(APIC_ID));
 
+    /* KAF: Need interrupts enabled for safe IPI. */
+    __sti();
+
     if (reboot_smp) {
 
         /* check to see if reboot_cpu is valid 

xen/arch/i386/setup.c

@@ -405,6 +405,8 @@ void __init start_of_day(void)
      */
 #endif
 
+    __sti();
+
     initialize_keytable(); /* call back handling for key codes      */
 
     serial_init_stage2();
@@ -422,8 +424,6 @@ void __init start_of_day(void)
     init_xen_time();	/* initialise the time */
     schedulers_start(); /* start scheduler for each CPU */
 
-    sti();
-
     check_nmi_watchdog();
 
 #ifdef CONFIG_PCI

xen/common/domain.c

@@ -295,7 +295,7 @@ struct pfn_info *alloc_domain_page(struct task_struct *p)
 #ifdef NO_DEVICES_IN_XEN
     ASSERT(!in_irq());
 #else
-    ASSERT((p != NULL) || !in_irq());
+    ASSERT((p == NULL) || !in_irq());
 #endif
 
     spin_lock_irqsave(&free_list_lock, flags);

xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c

@@ -437,7 +437,10 @@ static int network_close(struct net_device *dev)
 
     netif_stop_queue(np->dev);
 
-    while ( (np->rx_resp_cons != np->rx->req_prod) ||
+    np->state = NETIF_STATE_CONNECTED;
+
+    /* XXX We need to properly disconnect via the domain controller. */
+    while ( /*(np->rx_resp_cons != np->rx->req_prod) ||*/
             (np->tx_resp_cons != np->tx->req_prod) )
     {
         barrier();
@@ -445,10 +448,6 @@ static int network_close(struct net_device *dev)
         schedule_timeout(1);
     }
 
-    wmb();
-    np->state = NETIF_STATE_CONNECTED;
-    wmb();
-
     MOD_DEC_USE_COUNT;
 
     return 0;