Path: csiph.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod From: Borislav Petkov Newsgroups: linux.kernel Subject: [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c Date: Wed, 10 Feb 2016 11:10:04 +0100 Message-ID: References: X-Original-To: Ingo Molnar X-Mailer: git-send-email 2.3.5 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 60 Organization: linux.* mail to news gateway X-Original-Cc: X86 ML , LKML X-Original-Date: Wed, 10 Feb 2016 10:55:08 +0100 X-Original-Message-ID: <1455098123-11740-3-git-send-email-bp@alien8.de> X-Original-References: <1455098123-11740-1-git-send-email-bp@alien8.de> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1331011 From: Borislav Petkov Signed-off-by: Borislav Petkov Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Ingo Molnar Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver --- arch/x86/events/Makefile | 2 +- arch/x86/{kernel/cpu/perf_event_intel.c => events/intel/core.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename arch/x86/{kernel/cpu/perf_event_intel.c => events/intel/core.c} (99%) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index bcd1e214a76d..834e9ae507f9 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -5,4 +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 +obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/events/intel/core.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_intel.c rename to arch/x86/events/intel/core.c index fed2ab1f1065..1edf3013e528 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/events/intel/core.c @@ -18,7 +18,7 @@ #include #include -#include "perf_event.h" +#include "../../kernel/cpu/perf_event.h" /* * Intel PerfMon, used on Core and later. diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 30b57293b1b1..a9e3cf72689a 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -32,7 +32,7 @@ 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_lbr.o perf_event_intel_ds.o perf_event_intel.o +obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.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 obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_cstate.o -- 2.3.5