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

Groups > linux.kernel > #1336362

[tip:perf/core] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c

From tip-bot for Borislav Petkov <tipbot@zytor.com>
Newsgroups linux.kernel
Subject [tip:perf/core] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
Date 2016-02-17 13:30 +0100
Message-ID <r39p1-6nX-37@gated-at.bofh.it> (permalink)
References <r0zSI-OA-41@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  35bf705c25e875f40ff8ed6af415315335973977
Gitweb:     http://git.kernel.org/tip/35bf705c25e875f40ff8ed6af415315335973977
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 10 Feb 2016 10:55:16 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 17 Feb 2016 10:09:48 +0100

perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
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>
Link: http://lkml.kernel.org/r/1455098123-11740-11-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                               | 2 +-
 .../perf_event_intel_uncore_nhmex.c => events/intel/uncore_nhmex.c}    | 2 +-
 arch/x86/kernel/cpu/Makefile                                           | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index aae3e53..70aedfe 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -8,4 +8,4 @@ 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 intel/rapl.o
-obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c b/arch/x86/events/intel/uncore_nhmex.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
rename to arch/x86/events/intel/uncore_nhmex.c
index d70cfe0..e89bf5c 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
+++ b/arch/x86/events/intel/uncore_nhmex.c
@@ -1,5 +1,5 @@
 /* Nehalem-EX/Westmere-EX uncore support */
-#include "../../events/intel/uncore.h"
+#include "uncore.h"
 
 /* NHM-EX event control */
 #define NHMEX_PMON_CTL_EV_SEL_MASK	0x000000ff
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 875d1b1..316f53a 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -34,8 +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_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore_snb.o \
-					   perf_event_intel_uncore_snbep.o \
-					   perf_event_intel_uncore_nhmex.o
+					   perf_event_intel_uncore_snbep.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o
 endif

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