Merge tag 'for-linus-5.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (54dedb5b) · Commits · 戴 / test

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

arch/x86/xen/enlighten_pv.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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;

drivers/xen/preempt.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

Admin message