bitkeeper revision 1.1159.258.44 (4230e634q8GsmA11oFHvaUsWO4vUpA)

Change cli() to local_irq_disable().
Signed-off-by: Christian Limpach <chris@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/console/console.c b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
index f1fe3c517fae3fa6701db06f5c7b514d7fa1698a..fb276216be9daecb23677faf1debe9eee702d28a 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/console/console.c
@@ -234,7 +234,7 @@ void xencons_force_flush(void)
      * We use dangerous control-interface functions that require a quiescent
      * system and no interrupts. Try to ensure this with a global cli().
      */
-    cli();
+    local_irq_disable();       /* XXXsmp */
 
     /* Spin until console data is flushed through to the domain controller. */
     while ( (wc != wp) && !ctrl_if_transmitter_empty() )