public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Andi Kleen <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org,
	jolsa@redhat.com, hpa@zytor.com, peterz@infradead.org,
	eranian@google.com, ak@linux.intel.com, efault@gmx.de,
	tglx@linutronix.de, vincent.weaver@maine.edu,
	torvalds@linux-foundation.org
Subject: [tip:perf/core] perf/x86/intel: Fix __initconst declaration in the RAPL perf driver
Date: Sun, 6 Dec 2015 05:18:03 -0800	[thread overview]
Message-ID: <tip-da008ee72cabdee0ee98d3a3580ca5cfb8d2d1f1@git.kernel.org> (raw)
In-Reply-To: <1448905722-2767-1-git-send-email-andi@firstfloor.org>

Commit-ID:  da008ee72cabdee0ee98d3a3580ca5cfb8d2d1f1
Gitweb:     http://git.kernel.org/tip/da008ee72cabdee0ee98d3a3580ca5cfb8d2d1f1
Author:     Andi Kleen <ak@linux.intel.com>
AuthorDate: Mon, 30 Nov 2015 09:48:42 -0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Sun, 6 Dec 2015 12:55:53 +0100

perf/x86/intel: Fix __initconst declaration in the RAPL perf driver

Fix a definition in the perf rapl driver. __initconst must
be applied to a const object, but to declare a const pointer
you need to use * const ..., not const ... *

This fixes a section attribute conflict with LTO builds.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1448905722-2767-1-git-send-email-andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/cpu/perf_event_intel_rapl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
index ed446bd..fb5843d 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
@@ -63,7 +63,7 @@
 #define INTEL_RAPL_PP1		0x4	/* pseudo-encoding */
 
 #define NR_RAPL_DOMAINS         0x4
-static const char *rapl_domain_names[NR_RAPL_DOMAINS] __initconst = {
+static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = {
 	"pp0-core",
 	"package",
 	"dram",

      parent reply	other threads:[~2015-12-06 13:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-30 17:48 [PATCH] x86, perf: Fix __initconst declaration in rapl perf driver Andi Kleen
2015-12-04 11:58 ` [tip:perf/core] perf/x86/intel: Fix __initconst declaration in the RAPL " tip-bot for Andi Kleen
2015-12-06 13:18 ` tip-bot for Andi Kleen [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-da008ee72cabdee0ee98d3a3580ca5cfb8d2d1f1@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=vincent.weaver@maine.edu \
    /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