Commit-ID: a49ac9f83b31e41c8311d64bd2b3f97a23dcb38d Gitweb: http://git.kernel.org/tip/a49ac9f83b31e41c8311d64bd2b3f97a23dcb38d Author: Huang Rui <ray.hu...@amd.com> AuthorDate: Fri, 25 Mar 2016 11:18:25 +0800 Committer: Ingo Molnar <mi...@kernel.org> 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 <rdun...@infradead.org> Reported-by: build test robot <l...@intel.com> Signed-off-by: Huang Rui <ray.hu...@amd.com> Cc: Borislav Petkov <b...@alien8.de> Cc: Borislav Petkov <b...@suse.de> Cc: Fengguang Wu <fengguang...@intel.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Sherry Hurwitz <sherry.hurw...@amd.com> Cc: Stephen Rothwell <s...@canb.auug.org.au> Cc: Thomas Gleixner <t...@linutronix.de> Cc: a...@kernel.org Cc: kbuild-...@01.org Cc: linux-n...@vger.kernel.org Cc: spg_linux_ker...@amd.com Link: http://lkml.kernel.org/r/1458875905-4278-1-git-send-email-ray.hu...@amd.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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);
