x86, xen: do multicall callbacks with interrupts disabled

We can't call the callbacks after enabling interrupts, as we may get a
nested multicall call, which would cause a great deal of havok.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c
index 6cffd5532b913b6a1363f82ca8b65097d3c83e9c..8bff7e7c290b7d30ef805061115690e7267dc4a9 100644 (file)
--- a/arch/x86/xen/multicalls.c
+++ b/arch/x86/xen/multicalls.c
@@ -170,8 +170,6 @@ void xen_mc_flush(void)
        } else
                BUG_ON(b->argidx != 0);
 
-       local_irq_restore(flags);
-
        for (i = 0; i < b->cbidx; i++) {
                struct callback *cb = &b->callbacks[i];
 
@@ -179,6 +177,8 @@ void xen_mc_flush(void)
        }
        b->cbidx = 0;
 
+       local_irq_restore(flags);
+
        WARN_ON(ret);
 }