From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161562AbcBQM3H (ORCPT ); Wed, 17 Feb 2016 07:29:07 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56236 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161387AbcBQMRn (ORCPT ); Wed, 17 Feb 2016 07:17:43 -0500 Date: Wed, 17 Feb 2016 04:16:48 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: tglx@linutronix.de, acme@redhat.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org, vincent.weaver@maine.edu, hpa@zytor.com, jolsa@redhat.com, a.p.zijlstra@chello.nl, eranian@google.com, peterz@infradead.org Reply-To: acme@redhat.com, tglx@linutronix.de, peterz@infradead.org, eranian@google.com, a.p.zijlstra@chello.nl, hpa@zytor.com, jolsa@redhat.com, vincent.weaver@maine.edu, mingo@kernel.org, bp@suse.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <1455098123-11740-2-git-send-email-bp@alien8.de> References: <1455098123-11740-2-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c Git-Commit-ID: af5d3aabc04a4b7732b1d3404feebadfe5ae9362 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: af5d3aabc04a4b7732b1d3404feebadfe5ae9362 Gitweb: http://git.kernel.org/tip/af5d3aabc04a4b7732b1d3404feebadfe5ae9362 Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:07 +0100 Committer: Ingo Molnar CommitDate: Wed, 17 Feb 2016 10:09:45 +0100 perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c Start moving the Intel bits. 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-2-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 1 + arch/x86/{kernel/cpu/perf_event_intel_bts.c => events/intel/bts.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 7d1ecff..bcd1e21 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o ifdef CONFIG_AMD_IOMMU obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o endif +obj-$(CONFIG_CPU_SUP_INTEL) += intel/bts.o diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/events/intel/bts.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_intel_bts.c rename to arch/x86/events/intel/bts.c index 2cad71d..2bd4833 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_bts.c +++ b/arch/x86/events/intel/bts.c @@ -26,7 +26,7 @@ #include #include -#include "perf_event.h" +#include "../../kernel/cpu/perf_event.h" struct bts_ctx { struct perf_output_handle handle; diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 7edbeb9..e28f931 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -34,7 +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_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o perf_event_intel_cqm.o -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o perf_event_intel_bts.o +obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_cstate.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore.o \