From: Konrad Rzeszutek Wilk Date: Wed, 30 May 2012 22:23:56 +0000 (-0400) Subject: x86, amd, xen: Avoid NULL pointer paravirt references X-Git-Tag: v3.2.20~51 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af36d8c1604a720b299bf6d6d47da6375e3da37b;p=karo-tx-linux.git x86, amd, xen: Avoid NULL pointer paravirt references commit 1ab46fd319bcf1fcd9fb6311727d532b580e4eba upstream. 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: Andre Przywara Link: http://lkml.kernel.org/r/20120530222356.GA28417@andromeda.dapyr.net Signed-off-by: H. Peter Anvin Signed-off-by: Ben Hutchings --- diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index e7c920bfbc9d..cca659ecdd55 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -982,7 +982,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,