diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 16:10:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 16:10:10 -0800 |
| commit | 54dedb5b571d2fb0d65c3957ecfa9b32ce28d7f0 (patch) | |
| tree | b064258f87c6582a7301d99426bdb3ef56397984 | |
| parent | 63f01d852c75366fb4d15ce217d12c48b69a4bcc (diff) | |
| parent | 8645e56a4ad6dcbf504872db7f14a2f67db88ef2 (diff) | |
| download | random-54dedb5b571d2fb0d65c3957ecfa9b32ce28d7f0.tar.gz | |
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
| -rw-r--r-- | arch/x86/xen/enlighten_pv.c | 7 | ||||
| -rw-r--r-- | drivers/xen/preempt.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 1f756ffffe8b31..79409120a6036c 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -896,14 +896,15 @@ static u64 xen_read_msr_safe(unsigned int msr, int *err) static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) { int ret; +#ifdef CONFIG_X86_64 + unsigned int which; + u64 base; +#endif ret = 0; switch (msr) { #ifdef CONFIG_X86_64 - unsigned which; - u64 base; - case MSR_FS_BASE: which = SEGBASE_FS; goto set; case MSR_KERNEL_GS_BASE: which = SEGBASE_GS_USER; goto set; case MSR_GS_BASE: which = SEGBASE_GS_KERNEL; goto set; diff --git a/drivers/xen/preempt.c b/drivers/xen/preempt.c index 70650b248de5d4..17240c5325a30c 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); } } |