From: tip-bot for Peter Zijlstra <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
torvalds@linux-foundation.org, peterz@infradead.org,
suravee.suthikulpanit@amd.com, acme@infradead.org,
tglx@linutronix.de
Subject: [tip:perf/urgent] perf/x86/amd: Do not print an error when the device is not present
Date: Thu, 4 Jul 2013 23:51:31 -0700 [thread overview]
Message-ID: <tip-100ac5331519866afa9b000b10642b00cb6d03dd@git.kernel.org> (raw)
In-Reply-To: <20130703075542.GF23916@twins.programming.kicks-ass.net>
Commit-ID: 100ac5331519866afa9b000b10642b00cb6d03dd
Gitweb: http://git.kernel.org/tip/100ac5331519866afa9b000b10642b00cb6d03dd
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 3 Jul 2013 09:55:42 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 5 Jul 2013 08:27:15 +0200
perf/x86/amd: Do not print an error when the device is not present
As Linus said its not an error to not have an AMD IOMMU; esp.
when you're not even running on an AMD platform.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Link: http://lkml.kernel.org/r/20130703075542.GF23916@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/cpu/perf_event_amd_iommu.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
index 0db655e..639d128 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
@@ -491,10 +491,8 @@ static struct perf_amd_iommu __perf_iommu = {
static __init int amd_iommu_pc_init(void)
{
/* Make sure the IOMMU PC resource is available */
- if (!amd_iommu_pc_supported()) {
- pr_err("perf: amd_iommu PMU not installed. No support!\n");
+ if (!amd_iommu_pc_supported())
return -ENODEV;
- }
_init_perf_amd_iommu(&__perf_iommu, "amd_iommu");
prev parent reply other threads:[~2013-07-05 6:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-01 9:03 [GIT PULL] perf changes for v3.11 Ingo Molnar
2013-07-03 0:50 ` Linus Torvalds
2013-07-03 7:55 ` Peter Zijlstra
2013-07-03 17:32 ` Suravee Suthikulpanit
2013-07-05 6:27 ` Ingo Molnar
2013-07-05 6:51 ` tip-bot for Peter Zijlstra [this message]
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-100ac5331519866afa9b000b10642b00cb6d03dd@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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
Powered by JetHome