[Xen-changelog] [xen-3.2-testing] serial: Fix IRQ enable/disable in tx interrupt handler.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1225804485 0
# Node ID 9f8ba7a4c8afc21f3ba2978040cdb6537d02bfb3
# Parent  5de7bd81da986100cfbc9244563580f928d997b5
serial: Fix IRQ enable/disable in tx interrupt handler.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   18717:9e47e72fd03ec78378b46aa30633ced686838c6f
xen-unstable date:        Mon Oct 27 11:27:31 2008 +0000
---
 xen/drivers/char/serial.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 5de7bd81da98 -r 9f8ba7a4c8af xen/drivers/char/serial.c
--- a/xen/drivers/char/serial.c Tue Nov 04 13:14:23 2008 +0000
+++ b/xen/drivers/char/serial.c Tue Nov 04 13:14:45 2008 +0000
@@ -61,7 +61,7 @@ void serial_tx_interrupt(struct serial_p
     while ( !spin_trylock(&port->tx_lock) )
     {
         if ( !port->driver->tx_empty(port) )
-            return;
+            goto out;
         cpu_relax();
     }
 
@@ -76,7 +76,10 @@ void serial_tx_interrupt(struct serial_p
         }
     }
 
-    spin_unlock_irqrestore(&port->tx_lock, flags);
+    spin_unlock(&port->tx_lock);
+
+ out:
+    local_irq_restore(flags);
 }
 
 static void __serial_putc(struct serial_port *port, char c)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog