Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ab46fd3 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by H. Peter Anvin
Browse files

x86, amd, xen: Avoid NULL pointer paravirt references 



Stub out MSR methods that aren't actually needed.  This fixes a crash
as Xen Dom0 on AMD Trinity systems.  A bigger patch should be added to
remove the paravirt machinery completely for the methods which
apparently have no users!

Reported-by: default avatarAndre Przywara <andre.przywara@amd.com>
Link: http://lkml.kernel.org/r/20120530222356.GA28417@andromeda.dapyr.net


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: <stable@vger.kernel.org>
parent 2da06af8

arch/x86/xen/enlighten.c

+3 −0
Original line number Diff line number Diff line
@@ -1116,7 +1116,10 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { 
	.wbinvd = native_wbinvd,



	.read_msr = native_read_msr_safe,

	.rdmsr_regs = native_rdmsr_safe_regs,

	.write_msr = xen_write_msr_safe,

	.wrmsr_regs = native_wrmsr_safe_regs,



	.read_tsc = native_read_tsc,

	.read_pmc = native_read_pmc,