Commit bf000927 authored by Talons Lee's avatar Talons Lee Committed by Greg Kroah-Hartman

always clear the X2APIC_ENABLE bit for PV guest

[ Upstream commit 5268c8f3 ]

Commit e657fccb clears cpu capability bit instead of using fake cpuid
value, the EXTD should always be off for PV guest without depending
on cpuid value. So remove the cpuid check in xen_read_msr_safe() to
always clear the X2APIC_ENABLE bit.
Signed-off-by: 's avatarTalons Lee <>
Reviewed-by: Juergen Gross's avatarJuergen Gross <>
Signed-off-by: 's avatarBoris Ostrovsky <>
Signed-off-by: 's avatarSasha Levin <>
parent 506fde2c
......@@ -898,10 +898,7 @@ static u64 xen_read_msr_safe(unsigned int msr, int *err)
val = native_read_msr_safe(msr, err);
switch (msr) {
#ifdef CONFIG_X86_X2APIC
if (!(cpuid_ecx(1) & (1 << (X86_FEATURE_X2APIC & 31))))
val &= ~X2APIC_ENABLE;
val &= ~X2APIC_ENABLE;
return val;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment