From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422875AbcBQMWf (ORCPT ); Wed, 17 Feb 2016 07:22:35 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56462 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422842AbcBQMWd (ORCPT ); Wed, 17 Feb 2016 07:22:33 -0500 Date: Wed, 17 Feb 2016 04:21:44 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: torvalds@linux-foundation.org, vincent.weaver@maine.edu, acme@redhat.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, hpa@zytor.com, jolsa@redhat.com, peterz@infradead.org, bp@suse.de, eranian@google.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: jolsa@redhat.com, peterz@infradead.org, eranian@google.com, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org, torvalds@linux-foundation.org, vincent.weaver@maine.edu, tglx@linutronix.de, a.p.zijlstra@chello.nl, acme@redhat.com, hpa@zytor.com In-Reply-To: <1455098123-11740-13-git-send-email-bp@alien8.de> References: <1455098123-11740-13-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c Git-Commit-ID: ed367e6ca42716a11a6d1b5162fdd378f9494eff 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: ed367e6ca42716a11a6d1b5162fdd378f9494eff Gitweb: http://git.kernel.org/tip/ed367e6ca42716a11a6d1b5162fdd378f9494eff Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:18 +0100 Committer: Ingo Molnar CommitDate: Wed, 17 Feb 2016 10:11:34 +0100 perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.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-13-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 2 +- .../cpu/perf_event_intel_uncore_snbep.c => events/intel/uncore_snbep.c} | 2 +- arch/x86/kernel/cpu/Makefile | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index eb0d921..8c939ca 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -9,4 +9,4 @@ 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 intel/uncore_nhmex.o -obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore_snb.o +obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore_snb.o intel/uncore_snbep.o diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c rename to arch/x86/events/intel/uncore_snbep.c index 188e18a..0c801f7 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -1,5 +1,5 @@ /* SandyBridge-EP/IvyTown uncore support */ -#include "../../events/intel/uncore.h" +#include "uncore.h" /* SNB-EP Box level control */ #define SNBEP_PMON_BOX_CTL_RST_CTRL (1 << 0) diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 696d106..973b77b 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -33,7 +33,6 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o 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_snbep.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o endif