* [PATCH] x86, perf: Fix __initconst declaration in rapl perf driver
@ 2015-11-30 17:48 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
0 siblings, 2 replies; 3+ messages in thread
From: Andi Kleen @ 2015-11-30 17:48 UTC (permalink / raw)
To: peterz; +Cc: linux-kernel, mingo, Andi Kleen
From: Andi Kleen <ak@linux.intel.com>
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>
---
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",
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* [tip:perf/core] perf/x86/intel: Fix __initconst declaration in the RAPL perf driver
2015-11-30 17:48 [PATCH] x86, perf: Fix __initconst declaration in rapl perf driver Andi Kleen
@ 2015-12-04 11:58 ` tip-bot for Andi Kleen
2015-12-06 13:18 ` tip-bot for Andi Kleen
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Andi Kleen @ 2015-12-04 11:58 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, peterz, ak, acme, torvalds, linux-kernel, eranian, mingo,
jolsa, hpa, vincent.weaver, efault
Commit-ID: e2c99f678be372d5324fd57a4d557f232870a311
Gitweb: http://git.kernel.org/tip/e2c99f678be372d5324fd57a4d557f232870a311
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Mon, 30 Nov 2015 09:48:42 -0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 4 Dec 2015 10:58:33 +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",
^ permalink raw reply related [flat|nested] 3+ messages in thread* [tip:perf/core] perf/x86/intel: Fix __initconst declaration in the RAPL perf driver
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
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Andi Kleen @ 2015-12-06 13:18 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, acme, mingo, jolsa, hpa, peterz, eranian, ak,
efault, tglx, vincent.weaver, torvalds
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",
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-06 13:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.