From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422752AbcBQMVZ (ORCPT ); Wed, 17 Feb 2016 07:21:25 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56410 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161482AbcBQMVR (ORCPT ); Wed, 17 Feb 2016 07:21:17 -0500 Date: Wed, 17 Feb 2016 04:19:25 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, bp@suse.de, a.p.zijlstra@chello.nl, jolsa@redhat.com, acme@redhat.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, vincent.weaver@maine.edu, eranian@google.com, peterz@infradead.org Reply-To: vincent.weaver@maine.edu, torvalds@linux-foundation.org, eranian@google.com, peterz@infradead.org, mingo@kernel.org, bp@suse.de, hpa@zytor.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, acme@redhat.com, jolsa@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <1455098123-11740-8-git-send-email-bp@alien8.de> References: <1455098123-11740-8-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch] Git-Commit-ID: fd1c601c25785ef38d698ff0091b5fe253074715 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: fd1c601c25785ef38d698ff0091b5fe253074715 Gitweb: http://git.kernel.org/tip/fd1c601c25785ef38d698ff0091b5fe253074715 Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:13 +0100 Committer: Ingo Molnar CommitDate: Wed, 17 Feb 2016 10:09:47 +0100 perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch] 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-8-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 1 + arch/x86/{kernel/cpu/perf_event_intel_pt.c => events/intel/pt.c} | 4 ++-- arch/x86/{kernel/cpu/intel_pt.h => events/intel/pt.h} | 0 arch/x86/kernel/cpu/Makefile | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 48097fd..2a2f55d 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o 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 diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/events/intel/pt.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_intel_pt.c rename to arch/x86/events/intel/pt.c index c0bbd10..e56cebe 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_pt.c +++ b/arch/x86/events/intel/pt.c @@ -29,8 +29,8 @@ #include #include -#include "perf_event.h" -#include "intel_pt.h" +#include "../../kernel/cpu/perf_event.h" +#include "pt.h" static DEFINE_PER_CPU(struct pt, pt_ctx); diff --git a/arch/x86/kernel/cpu/intel_pt.h b/arch/x86/events/intel/pt.h similarity index 100% rename from arch/x86/kernel/cpu/intel_pt.h rename to arch/x86/events/intel/pt.h diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index d52ed9b..595e3ff 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_CPU_SUP_INTEL) += perf_event_intel_rapl.o -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore.o \ perf_event_intel_uncore_snb.o \