Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-4
+4
-3
arch/x86/xen/enlighten_pv.c
+4
-3
arch/x86/xen/enlighten_pv.c
···
896
896
static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
897
897
{
898
898
int ret;
899
+
#ifdef CONFIG_X86_64
900
+
unsigned int which;
901
+
u64 base;
902
+
#endif
899
903
900
904
ret = 0;
901
905
902
906
switch (msr) {
903
907
#ifdef CONFIG_X86_64
904
-
unsigned which;
905
-
u64 base;
906
-
907
908
case MSR_FS_BASE: which = SEGBASE_FS; goto set;
908
909
case MSR_KERNEL_GS_BASE: which = SEGBASE_GS_USER; goto set;
909
910
case MSR_GS_BASE: which = SEGBASE_GS_KERNEL; goto set;