From: tip-bot for Konrad Rzeszutek Wilk <konrad@darnok.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
konrad@darnok.org, andre.przywara@amd.com,
stable@vger.kernel.org, tglx@linutronix.de
Subject: [tip:x86/urgent] x86, amd, xen: Avoid NULL pointer paravirt references
Date: Wed, 30 May 2012 16:23:42 -0700 [thread overview]
Message-ID: <tip-1ab46fd319bcf1fcd9fb6311727d532b580e4eba@git.kernel.org> (raw)
In-Reply-To: <20120530222356.GA28417@andromeda.dapyr.net>
Commit-ID: 1ab46fd319bcf1fcd9fb6311727d532b580e4eba
Gitweb: http://git.kernel.org/tip/1ab46fd319bcf1fcd9fb6311727d532b580e4eba
Author: Konrad Rzeszutek Wilk <konrad@darnok.org>
AuthorDate: Wed, 30 May 2012 18:23:56 -0400
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Wed, 30 May 2012 16:15:02 -0700
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: 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 | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 75f33b2..e74df95 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -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,
parent reply other threads:[~2012-05-30 23:23 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20120530222356.GA28417@andromeda.dapyr.net>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-1ab46fd319bcf1fcd9fb6311727d532b580e4eba@git.kernel.org \
--to=konrad@darnok.org \
--cc=andre.przywara@amd.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).