From: cl349@firebug.cl.cam.ac.uk Date: Fri, 11 Mar 2005 00:28:36 +0000 (+0000) Subject: bitkeeper revision 1.1159.258.44 (4230e634q8GsmA11oFHvaUsWO4vUpA) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~128 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1f702950d8def4021179517d27c1764e8c0d11f4;p=xen.git bitkeeper revision 1.1159.258.44 (4230e634q8GsmA11oFHvaUsWO4vUpA) Change cli() to local_irq_disable(). Signed-off-by: Christian Limpach --- 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 f1fe3c517f..fb276216be 100644 --- 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() )