linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Zhang Rui" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>, Ingo Molnar <mingo@kernel.org>,
	Kan Liang <kan.liang@linux.intel.com>,
	Len Brown <len.brown@intel.com>, Jiri Olsa <jolsa@redhat.com>,
	x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: perf/urgent] perf/x86/rapl: Fix missing psys sysfs attributes
Date: Fri, 14 Aug 2020 15:23:30 -0000	[thread overview]
Message-ID: <159741861009.3192.851997896622686550.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200811153149.12242-2-rui.zhang@intel.com>

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     4bb5fcb97a5df0bbc0a27e0252b1e7ce140a8431
Gitweb:        https://git.kernel.org/tip/4bb5fcb97a5df0bbc0a27e0252b1e7ce140a8431
Author:        Zhang Rui <rui.zhang@intel.com>
AuthorDate:    Tue, 11 Aug 2020 23:31:47 +08:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 14 Aug 2020 12:35:11 +02:00

perf/x86/rapl: Fix missing psys sysfs attributes

This fixes a problem introduced by commit:

  5fb5273a905c ("perf/x86/rapl: Use new MSR detection interface")

that perf event sysfs attributes for psys RAPL domain are missing.

Fixes: 5fb5273a905c ("perf/x86/rapl: Use new MSR detection interface")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Reviewed-by: Len Brown <len.brown@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20200811153149.12242-2-rui.zhang@intel.com
---
 arch/x86/events/rapl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 68b3882..e972383 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -665,7 +665,7 @@ static const struct attribute_group *rapl_attr_update[] = {
 	&rapl_events_pkg_group,
 	&rapl_events_ram_group,
 	&rapl_events_gpu_group,
-	&rapl_events_gpu_group,
+	&rapl_events_psys_group,
 	NULL,
 };
 

  reply	other threads:[~2020-08-14 15:23 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-11 15:31 [PATCH v2 0/3] perf/x86/rapl: Add Intel SapphireRapids support Zhang Rui
2020-08-11 15:31 ` [PATCH v2 1/3] perf/x86/rapl: Fix missing psys sysfs attributes Zhang Rui
2020-08-14 15:23   ` tip-bot2 for Zhang Rui [this message]
2020-08-11 15:31 ` [PATCH v2 2/3] perf/x86/rapl: Support multiple rapl unit quirks Zhang Rui
2020-08-11 18:19   ` Joe Perches
2020-08-12  3:29     ` Zhang Rui
2020-08-12  3:51       ` Joe Perches
2020-08-14 15:23   ` [tip: perf/urgent] perf/x86/rapl: Support multiple RAPL " tip-bot2 for Zhang Rui
2020-08-11 15:31 ` [PATCH v2 3/3] perf/x86/rapl: Add support for Intel SPR platform Zhang Rui
2020-08-14 15:23   ` [tip: perf/urgent] " tip-bot2 for Zhang Rui

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=159741861009.3192.851997896622686550.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=jolsa@redhat.com \
    --cc=kan.liang@linux.intel.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=rui.zhang@intel.com \
    --cc=x86@kernel.org \
    --subject='Re: [tip: perf/urgent] perf/x86/rapl: Fix missing psys sysfs attributes' \
    /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

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).