aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 13:38:56 -0800
committerIngo Molnar <mingo@elte.hu>2009-02-16 08:56:41 +0100
commitc99608637eac8834d830496c462c054137772122 (patch)
tree2ed6f93a8e733a61a78d61f5181c79246f5458f9
parent3d39e9d07b576ee72f2c94cfad9e618fe21763b2 (diff)
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>
-rw-r--r--arch/x86/xen/multicalls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c
index 6cffd5532b9..8bff7e7c290 100644
--- 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);
}