Skip to content

Commit d947d68

Browse files
committed
Merge tag 'for-linus-6.12a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fix from Juergen Gross: "A fix for topology information of Xen PV guests" * tag 'for-linus-6.12a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: mark boot CPU of PV guest in MSR_IA32_APICBASE
2 parents 9e4c6c1 + bf56c41 commit d947d68

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/x86/xen/enlighten_pv.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,6 +1032,10 @@ static u64 xen_do_read_msr(unsigned int msr, int *err)
10321032
switch (msr) {
10331033
case MSR_IA32_APICBASE:
10341034
val &= ~X2APIC_ENABLE;
1035+
if (smp_processor_id() == 0)
1036+
val |= MSR_IA32_APICBASE_BSP;
1037+
else
1038+
val &= ~MSR_IA32_APICBASE_BSP;
10351039
break;
10361040
}
10371041
return val;

0 commit comments

Comments
 (0)