From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752755AbcCYMLF (ORCPT ); Fri, 25 Mar 2016 08:11:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42058 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752688AbcCYMLB (ORCPT ); Fri, 25 Mar 2016 08:11:01 -0400 Date: Fri, 25 Mar 2016 05:07:29 -0700 From: tip-bot for Huang Rui Message-ID: Cc: rdunlap@infradead.org, bp@suse.de, hpa@zytor.com, fengguang.wu@intel.com, lkp@intel.com, linux-kernel@vger.kernel.org, sfr@canb.auug.org.au, peterz@infradead.org, torvalds@linux-foundation.org, ray.huang@amd.com, mingo@kernel.org, tglx@linutronix.de, bp@alien8.de, sherry.hurwitz@amd.com Reply-To: linux-kernel@vger.kernel.org, sfr@canb.auug.org.au, peterz@infradead.org, lkp@intel.com, hpa@zytor.com, fengguang.wu@intel.com, bp@suse.de, rdunlap@infradead.org, sherry.hurwitz@amd.com, bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org, mingo@kernel.org, ray.huang@amd.com In-Reply-To: <1458875905-4278-1-git-send-email-ray.huang@amd.com> References: <1458875905-4278-1-git-send-email-ray.huang@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86: Move events_sysfs_show() outside CPU_SUP_INTEL Git-Commit-ID: a49ac9f83b31e41c8311d64bd2b3f97a23dcb38d 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: a49ac9f83b31e41c8311d64bd2b3f97a23dcb38d Gitweb: http://git.kernel.org/tip/a49ac9f83b31e41c8311d64bd2b3f97a23dcb38d Author: Huang Rui AuthorDate: Fri, 25 Mar 2016 11:18:25 +0800 Committer: Ingo Molnar CommitDate: Fri, 25 Mar 2016 09:46:53 +0100 perf/x86: Move events_sysfs_show() outside CPU_SUP_INTEL randconfig builds can sometimes disable CONFIG_CPU_SUP_INTEL while enabling the AMD power reporting PMU driver, resulting in this build failure: arch/x86/kernel/cpu/perf_event.h:663:31: error: 'events_sysfs_show' undeclared here (not in a function) To fix it, move events_sysfs_show() outside of #ifdef CONFIG_CPU_SUP_INTEL. Reported-by: Randy Dunlap Reported-by: build test robot Signed-off-by: Huang Rui Cc: Borislav Petkov Cc: Borislav Petkov Cc: Fengguang Wu Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Sherry Hurwitz Cc: Stephen Rothwell Cc: Thomas Gleixner Cc: acme@kernel.org Cc: kbuild-all@01.org Cc: linux-next@vger.kernel.org Cc: spg_linux_kernel@amd.com Link: http://lkml.kernel.org/r/1458875905-4278-1-git-send-email-ray.huang@amd.com Signed-off-by: Ingo Molnar --- arch/x86/events/perf_event.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index ba6ef18..a6771e2 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -795,6 +795,9 @@ ssize_t intel_event_sysfs_show(char *page, u64 config); struct attribute **merge_attr(struct attribute **a, struct attribute **b); +ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, + char *page); + #ifdef CONFIG_CPU_SUP_AMD int amd_pmu_init(void); @@ -925,9 +928,6 @@ int p6_pmu_init(void); int knc_pmu_init(void); -ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr, - char *page); - static inline int is_ht_workaround_enabled(void) { return !!(x86_pmu.flags & PMU_FL_EXCL_ENABLED);