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

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1225106851 0
# Node ID 9e47e72fd03ec78378b46aa30633ced686838c6f
# Parent  efc0a4065ee1fd76b010ff6e1d09d865ea1ec50e
serial: Fix IRQ enable/disable in tx interrupt handler.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/drivers/char/serial.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -r efc0a4065ee1 -r 9e47e72fd03e xen/drivers/char/serial.c
--- a/xen/drivers/char/serial.c Mon Oct 27 10:49:20 2008 +0000
+++ b/xen/drivers/char/serial.c Mon Oct 27 11:27:31 2008 +0000
@@ -74,7 +74,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();
     }
 
@@ -89,7 +89,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