From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755994AbbLDL7a (ORCPT ); Fri, 4 Dec 2015 06:59:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:60327 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752282AbbLDL72 (ORCPT ); Fri, 4 Dec 2015 06:59:28 -0500 Date: Fri, 4 Dec 2015 03:58:40 -0800 From: tip-bot for Andi Kleen Message-ID: Cc: tglx@linutronix.de, peterz@infradead.org, ak@linux.intel.com, acme@redhat.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, eranian@google.com, mingo@kernel.org, jolsa@redhat.com, hpa@zytor.com, vincent.weaver@maine.edu, efault@gmx.de Reply-To: ak@linux.intel.com, acme@redhat.com, peterz@infradead.org, tglx@linutronix.de, eranian@google.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, jolsa@redhat.com, efault@gmx.de, hpa@zytor.com, vincent.weaver@maine.edu In-Reply-To: <1448905722-2767-1-git-send-email-andi@firstfloor.org> References: <1448905722-2767-1-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel: Fix __initconst declaration in the RAPL perf driver Git-Commit-ID: e2c99f678be372d5324fd57a4d557f232870a311 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e2c99f678be372d5324fd57a4d557f232870a311 Gitweb: http://git.kernel.org/tip/e2c99f678be372d5324fd57a4d557f232870a311 Author: Andi Kleen AuthorDate: Mon, 30 Nov 2015 09:48:42 -0800 Committer: Ingo Molnar 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 Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1448905722-2767-1-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar --- 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",