summaryrefslogtreecommitdiff
path: root/drivers/xen/preempt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/xen/preempt.c')
-rw-r--r--drivers/xen/preempt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/preempt.c b/drivers/xen/preempt.c
index 456a164364a2..98a9d6892d98 100644
--- a/drivers/xen/preempt.c
+++ b/drivers/xen/preempt.c
@@ -27,7 +27,7 @@ EXPORT_SYMBOL_GPL(xen_in_preemptible_hcall);
asmlinkage __visible void xen_maybe_preempt_hcall(void)
{
if (unlikely(__this_cpu_read(xen_in_preemptible_hcall)
- && need_resched())) {
+ && need_resched() && !preempt_count())) {
/*
* Clear flag as we may be rescheduled on a different
* cpu.