x86, amd, xen: Avoid NULL pointer paravirt references
authorKonrad Rzeszutek Wilk <konrad@darnok.org>
Wed, 30 May 2012 22:23:56 +0000 (18:23 -0400)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 30 May 2012 23:15:02 +0000 (16:15 -0700)
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 <andre.przywara@amd.com>
Link: http://lkml.kernel.org/r/20120530222356.GA28417@andromeda.dapyr.net
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: <stable@vger.kernel.org>
arch/x86/xen/enlighten.c

index 75f33b2a59336a865d7f8abf1dada19763696b70..e74df9548a025c2d66b3052f8ac0002695e59498 100644 (file)
@@ -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,