From fd1c601c25785ef38d698ff0091b5fe253074715 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 10 Feb 2016 10:55:13 +0100 Subject: [PATCH] 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 + .../{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(-) rename arch/x86/{kernel/cpu/perf_event_intel_pt.c => events/intel/pt.c} (99%) rename arch/x86/{kernel/cpu/intel_pt.h => events/intel/pt.h} (100%) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 48097fd4aa71..2a2f55d7b6f2 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 c0bbd1033b7c..e56cebe07994 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 d52ed9b918b3..595e3ff6cd1b 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 \ -- 2.30.2