summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-22 03:10:10 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-22 03:10:10 +0300
commit54dedb5b571d2fb0d65c3957ecfa9b32ce28d7f0 (patch)
treeb064258f87c6582a7301d99426bdb3ef56397984 /drivers
parent63f01d852c75366fb4d15ce217d12c48b69a4bcc (diff)
parent8645e56a4ad6dcbf504872db7f14a2f67db88ef2 (diff)
downloadlinux-54dedb5b571d2fb0d65c3957ecfa9b32ce28d7f0.tar.xz
Merge tag 'for-linus-5.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross: "Two small fixes for Xen: - a fix to avoid warnings with new gcc - a fix for incorrectly disabled interrupts when calling _cond_resched()" * tag 'for-linus-5.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen: Enable interrupts when calling _cond_resched() x86/xen: Distribute switch variables for initialization
Diffstat (limited to 'drivers')
-rw-r--r--drivers/xen/preempt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/xen/preempt.c b/drivers/xen/preempt.c
index 70650b248de5..17240c5325a3 100644
--- a/drivers/xen/preempt.c
+++ b/drivers/xen/preempt.c
@@ -33,7 +33,9 @@ asmlinkage __visible void xen_maybe_preempt_hcall(void)
* cpu.
*/
__this_cpu_write(xen_in_preemptible_hcall, false);
- _cond_resched();
+ local_irq_enable();
+ cond_resched();
+ local_irq_disable();
__this_cpu_write(xen_in_preemptible_hcall, true);
}
}