From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422836AbcBQMVr (ORCPT ); Wed, 17 Feb 2016 07:21:47 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56431 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422802AbcBQMVp (ORCPT ); Wed, 17 Feb 2016 07:21:45 -0500 Date: Wed, 17 Feb 2016 04:20:49 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: acme@redhat.com, mingo@kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, eranian@google.com, linux-kernel@vger.kernel.org, jolsa@redhat.com, vincent.weaver@maine.edu, a.p.zijlstra@chello.nl, bp@suse.de, hpa@zytor.com, tglx@linutronix.de Reply-To: bp@suse.de, a.p.zijlstra@chello.nl, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, jolsa@redhat.com, vincent.weaver@maine.edu, peterz@infradead.org, torvalds@linux-foundation.org, eranian@google.com, acme@redhat.com, mingo@kernel.org In-Reply-To: <1455098123-11740-11-git-send-email-bp@alien8.de> References: <1455098123-11740-11-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Git-Commit-ID: 35bf705c25e875f40ff8ed6af415315335973977 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: 35bf705c25e875f40ff8ed6af415315335973977 Gitweb: http://git.kernel.org/tip/35bf705c25e875f40ff8ed6af415315335973977 Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:16 +0100 Committer: Ingo Molnar CommitDate: Wed, 17 Feb 2016 10:09:48 +0100 perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Signed-off-by: Borislav Petkov Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1455098123-11740-11-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 2 +- .../perf_event_intel_uncore_nhmex.c => events/intel/uncore_nhmex.c} | 2 +- arch/x86/kernel/cpu/Makefile | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index aae3e53..70aedfe 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -8,4 +8,4 @@ endif obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o intel/cqm.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/cstate.o intel/ds.o intel/lbr.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/pt.o intel/rapl.o -obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore.o +obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore.o intel/uncore_nhmex.o diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c b/arch/x86/events/intel/uncore_nhmex.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c rename to arch/x86/events/intel/uncore_nhmex.c index d70cfe0..e89bf5c 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c +++ b/arch/x86/events/intel/uncore_nhmex.c @@ -1,5 +1,5 @@ /* Nehalem-EX/Westmere-EX uncore support */ -#include "../../events/intel/uncore.h" +#include "uncore.h" /* NHM-EX event control */ #define NHMEX_PMON_CTL_EV_SEL_MASK 0x000000ff diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 875d1b1..316f53a 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -34,8 +34,7 @@ ifdef CONFIG_PERF_EVENTS obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore_snb.o \ - perf_event_intel_uncore_snbep.o \ - perf_event_intel_uncore_nhmex.o + perf_event_intel_uncore_snbep.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o endif