Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1331011

[PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c

Show key headers only | View raw

From: Borislav Petkov <bp@suse.de>

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
---
 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 <asm/hardirq.h>
 #include <asm/apic.h>
 
-#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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
  [PATCH 08/17] perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel_rapl.c ....... =>   x86/events/intel/rapl.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 13/17] perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_knc.c .............. =>   x86/events/intel/knc.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 07/17] perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch] Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... =>   x86/events/intel/pt.[ch] tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 06/17] perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel_lbr.c ........ =>   x86/events/intel/lbr.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 12/17] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel_uncore_snbep.c =>   x86/events/intel/uncore_snbep.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 10/17] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel_uncore_nhmex.c =>   x86/events/intel/uncore_nmhex.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 04/17] perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel_cstate.c ..... =>   x86/events/intel/cstate.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel.c ............ =>   x86/events/intel/core.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
  [PATCH 09/17] perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch] Borislav Petkov <bp@alien8.de> - 2016-02-10 11:10 +0100
    [tip:perf/core] perf/x86: Move perf_event_intel_uncore.[ch] .. =>   x86/events/intel/uncore.[ch] tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100

csiph-web