linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/17] perf: Sanitize perf directory structure, p2
@ 2016-02-10  9:55 Borislav Petkov
  2016-02-10  9:55 ` [PATCH 01/17] perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c Borislav Petkov
                   ` (16 more replies)
  0 siblings, 17 replies; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

From: Borislav Petkov <bp@suse.de>

Hi,

Here's the conversion of the Intel part of perf events. I better not
wait all too long with this before people start touching those files and
all kinds of application conflicts happen.

Btw, one of the things that change with this move is pr_fmt():

-perf_event_intel: PMU erratum BJ122, BV98, HSD29 worked around, HT is on
+core: PMU erratum BJ122, BV98, HSD29 worked around, HT is on

we probably should consider defining pr_fmt to "x86/perf" or so for all
perf_events stuff in arch/x86. But that's for later.

Ingo, I hope I've deduced your names formatting properly :-)

perf/x86: Move perf_event.c ............... => x86/events/core.c
perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c
perf/x86: Move perf_event_amd_ibs.c ....... => x86/events/amd/ibs.c
perf/x86: Move perf_event_amd_iommu.[ch] .. => x86/events/amd/iommu.[ch]
perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.c

perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c
perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c
perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c
perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c
perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c
perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c
perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch]
perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c
perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch]
perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c
perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c
perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c
perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c
perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c

Borislav Petkov (17):
  perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c
  perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c
  perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c
  perf/x86: Move perf_event_intel_cstate.c .. =>
    x86/events/intel/cstate.c
  perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c
  perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c
  perf/x86: Move perf_event_intel_pt.[ch] ... =>
    x86/events/intel/pt.[ch]
  perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c
  perf/x86: Move perf_event_intel_uncore.[ch] =>
    x86/events/intel/uncore.[ch]
  perf/x86: Move perf_event_intel_uncore_nhmex.c =>
    x86/events/intel/uncore_nmhex.c
  perf/x86: Move perf_event_intel_uncore_snb.c =>
    x86/events/intel/uncore_snb.c
  perf/x86: Move perf_event_intel_uncore_snbep.c =>
    x86/events/intel/uncore_snbep.c
  perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c
  perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c
  perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c
  perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c
  perf/x86: Move perf_event.h to its new home

 arch/x86/events/Makefile                                 |  8 +++++++-
 arch/x86/events/amd/core.c                               |  2 +-
 arch/x86/events/amd/ibs.c                                |  2 +-
 arch/x86/events/amd/iommu.c                              |  2 +-
 arch/x86/events/core.c                                   |  2 +-
 .../cpu/perf_event_intel_bts.c => events/intel/bts.c}    |  2 +-
 .../cpu/perf_event_intel.c => events/intel/core.c}       |  2 +-
 .../cpu/perf_event_intel_cqm.c => events/intel/cqm.c}    |  2 +-
 .../perf_event_intel_cstate.c => events/intel/cstate.c}  |  2 +-
 .../cpu/perf_event_intel_ds.c => events/intel/ds.c}      |  2 +-
 .../{kernel/cpu/perf_event_knc.c => events/intel/knc.c}  |  2 +-
 .../cpu/perf_event_intel_lbr.c => events/intel/lbr.c}    |  2 +-
 .../{kernel/cpu/perf_event_p4.c => events/intel/p4.c}    |  2 +-
 .../{kernel/cpu/perf_event_p6.c => events/intel/p6.c}    |  2 +-
 .../cpu/perf_event_intel_pt.c => events/intel/pt.c}      |  4 ++--
 arch/x86/{kernel/cpu/intel_pt.h => events/intel/pt.h}    |  0
 .../cpu/perf_event_intel_rapl.c => events/intel/rapl.c}  |  2 +-
 .../perf_event_intel_uncore.c => events/intel/uncore.c}  |  2 +-
 .../perf_event_intel_uncore.h => events/intel/uncore.h}  |  2 +-
 .../intel/uncore_nhmex.c}                                |  2 +-
 .../intel/uncore_snb.c}                                  |  2 +-
 .../intel/uncore_snbep.c}                                |  3 +--
 arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c}   |  0
 arch/x86/{kernel/cpu => events}/perf_event.h             |  0
 arch/x86/kernel/cpu/Makefile                             | 16 ----------------
 arch/x86/xen/pmu.c                                       |  2 +-
 26 files changed, 29 insertions(+), 40 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_bts.c => events/intel/bts.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel.c => events/intel/core.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_cqm.c => events/intel/cqm.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_cstate.c => events/intel/cstate.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_ds.c => events/intel/ds.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_knc.c => events/intel/knc.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_lbr.c => events/intel/lbr.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} (99%)
 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%)
 rename arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore.c => events/intel/uncore.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore.h => events/intel/uncore.h} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore_nhmex.c => events/intel/uncore_nhmex.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snb.c => events/intel/uncore_snb.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snbep.c => events/intel/uncore_snbep.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c} (100%)
 rename arch/x86/{kernel/cpu => events}/perf_event.h (100%)

-- 
2.3.5

^ permalink raw reply	[flat|nested] 35+ messages in thread

* [PATCH 01/17] perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:16   ` [tip:perf/core] perf/x86: Move perf_event_intel_bts.c ........ " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c Borislav Petkov
                   ` (15 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

From: Borislav Petkov <bp@suse.de>

Start moving the Intel bits.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
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>
---
 arch/x86/events/Makefile                                           | 1 +
 arch/x86/{kernel/cpu/perf_event_intel_bts.c => events/intel/bts.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_bts.c => events/intel/bts.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 7d1ecff583b0..bcd1e214a76d 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -5,3 +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
diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/events/intel/bts.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_bts.c
rename to arch/x86/events/intel/bts.c
index 2cad71d1b14c..2bd4833367a7 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
+++ b/arch/x86/events/intel/bts.c
@@ -26,7 +26,7 @@
 #include <asm-generic/sizes.h>
 #include <asm/perf_event.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 struct bts_ctx {
 	struct perf_output_handle	handle;
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index d8cf3338a035..30b57293b1b1 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -34,7 +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_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_rapl.o perf_event_intel_cqm.o
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o perf_event_intel_bts.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o
 
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
  2016-02-10  9:55 ` [PATCH 01/17] perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:17   ` [tip:perf/core] perf/x86: Move perf_event_intel.c ............ " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 03/17] perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c Borislav Petkov
                   ` (14 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 03/17] perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
  2016-02-10  9:55 ` [PATCH 01/17] perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c Borislav Petkov
  2016-02-10  9:55 ` [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:17   ` [tip:perf/core] perf/x86: Move perf_event_intel_cqm.c ........ " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 04/17] perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c Borislav Petkov
                   ` (13 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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_cqm.c => events/intel/cqm.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_cqm.c => events/intel/cqm.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 834e9ae507f9..f97c283ec7a2 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/core.o intel/bts.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/core.o intel/bts.o intel/cqm.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/events/intel/cqm.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_cqm.c
rename to arch/x86/events/intel/cqm.c
index a316ca96f1b6..d1b623a15ac0 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
+++ b/arch/x86/events/intel/cqm.c
@@ -7,7 +7,7 @@
 #include <linux/perf_event.h>
 #include <linux/slab.h>
 #include <asm/cpu_device_id.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define MSR_IA32_PQR_ASSOC	0x0c8f
 #define MSR_IA32_QM_CTR		0x0c8e
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index a9e3cf72689a..6b9c25a41060 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -33,7 +33,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
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o perf_event_intel_cqm.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o
 
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 04/17] perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (2 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 03/17] perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:18   ` [tip:perf/core] perf/x86: Move perf_event_intel_cstate.c ..... " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 05/17] perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c Borislav Petkov
                   ` (12 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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                                                | 1 +
 .../x86/{kernel/cpu/perf_event_intel_cstate.c => events/intel/cstate.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                            | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_cstate.c => events/intel/cstate.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index f97c283ec7a2..e0a70fea7332 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,3 +6,4 @@ ifdef CONFIG_AMD_IOMMU
 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
diff --git a/arch/x86/kernel/cpu/perf_event_intel_cstate.c b/arch/x86/events/intel/cstate.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_cstate.c
rename to arch/x86/events/intel/cstate.c
index 75a38b5a2e26..1bbf37e8604b 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -89,7 +89,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format)		\
 static ssize_t __cstate_##_var##_show(struct kobject *kobj,	\
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 6b9c25a41060..2ed747e7db2b 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -35,7 +35,6 @@ 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
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o
 
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
 					   perf_event_intel_uncore_snb.o \
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 05/17] perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (3 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 04/17] perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:18   ` [tip:perf/core] perf/x86: Move perf_event_intel_ds.c ......... " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 06/17] perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c Borislav Petkov
                   ` (11 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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_ds.c => events/intel/ds.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_ds.c => events/intel/ds.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index e0a70fea7332..c4d41b66d167 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,4 +6,4 @@ ifdef CONFIG_AMD_IOMMU
 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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/cstate.o intel/ds.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/events/intel/ds.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_ds.c
rename to arch/x86/events/intel/ds.c
index 7c79261ed939..9677207a2ab1 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -5,7 +5,7 @@
 #include <asm/perf_event.h>
 #include <asm/insn.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 /* The size of a BTS record in bytes: */
 #define BTS_RECORD_SIZE		24
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 2ed747e7db2b..a5e895754449 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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_lbr.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 06/17] perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (4 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 05/17] perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:18   ` [tip:perf/core] perf/x86: Move perf_event_intel_lbr.c ........ " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 07/17] perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch] Borislav Petkov
                   ` (10 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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_lbr.c => events/intel/lbr.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                       | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_lbr.c => events/intel/lbr.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index c4d41b66d167..48097fd4aa71 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,4 +6,4 @@ ifdef CONFIG_AMD_IOMMU
 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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/cstate.o intel/ds.o intel/lbr.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/events/intel/lbr.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_lbr.c
rename to arch/x86/events/intel/lbr.c
index 653f88d25987..78c88f9293cc 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -5,7 +5,7 @@
 #include <asm/msr.h>
 #include <asm/insn.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 enum {
 	LBR_FORMAT_32		= 0x00,
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index a5e895754449..4b9dbfd92f1e 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -32,7 +32,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_lbr.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 07/17] perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch]
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (5 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 06/17] perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:19   ` [tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 08/17] perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c Borislav Petkov
                   ` (9 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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                                         | 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(-)
 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 <asm/io.h>
 #include <asm/intel_pt.h>
 
-#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 4b9dbfd92f1e..3d099eac0425 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.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 08/17] perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (6 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 07/17] perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch] Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:19   ` [tip:perf/core] perf/x86: Move perf_event_intel_rapl.c ....... " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 09/17] perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch] Borislav Petkov
                   ` (8 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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_rapl.c => events/intel/rapl.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 2a2f55d7b6f2..f68232c4de81 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -7,4 +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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/pt.o intel/rapl.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/events/intel/rapl.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_rapl.c
rename to arch/x86/events/intel/rapl.c
index 24a351ad628d..9541f50a534a 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -48,7 +48,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 /*
  * RAPL energy status counters
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 3d099eac0425..b06bc7f75648 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -32,7 +32,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_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
 					   perf_event_intel_uncore_snb.o \
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 09/17] perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch]
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (7 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 08/17] perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:20   ` [tip:perf/core] perf/x86: Move perf_event_intel_uncore.[ch] .. " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 10/17] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Borislav Petkov
                   ` (7 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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                                               | 1 +
 .../{kernel/cpu/perf_event_intel_uncore.c => events/intel/uncore.c}    | 2 +-
 .../{kernel/cpu/perf_event_intel_uncore.h => events/intel/uncore.h}    | 2 +-
 arch/x86/kernel/cpu/Makefile                                           | 3 +--
 arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c                    | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c                      | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c                    | 3 +--
 7 files changed, 7 insertions(+), 8 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore.c => events/intel/uncore.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore.h => events/intel/uncore.h} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index f68232c4de81..aae3e530e2ee 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -8,3 +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
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/events/intel/uncore.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore.c
rename to arch/x86/events/intel/uncore.c
index 3bf41d413775..91a18d6c4405 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -1,4 +1,4 @@
-#include "perf_event_intel_uncore.h"
+#include "uncore.h"
 
 static struct intel_uncore_type *empty_uncore[] = { NULL, };
 struct intel_uncore_type **uncore_msr_uncores = empty_uncore;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/events/intel/uncore.h
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore.h
rename to arch/x86/events/intel/uncore.h
index a7086b862156..1dea2046990a 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -2,7 +2,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/perf_event.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define UNCORE_PMU_NAME_LEN		32
 #define UNCORE_PMU_HRTIMER_INTERVAL	(60LL * NSEC_PER_SEC)
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index b06bc7f75648..14304dc68719 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -33,8 +33,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_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
-					   perf_event_intel_uncore_snb.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
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
index 2749965afed0..d70cfe0be86a 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
@@ -1,5 +1,5 @@
 /* Nehalem-EX/Westmere-EX uncore support */
-#include "perf_event_intel_uncore.h"
+#include "../../events/intel/uncore.h"
 
 /* NHM-EX event control */
 #define NHMEX_PMON_CTL_EV_SEL_MASK	0x000000ff
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
index 2bd030ddd0db..e0e41f55a20c 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
@@ -1,5 +1,5 @@
 /* Nehalem/SandBridge/Haswell uncore support */
-#include "perf_event_intel_uncore.h"
+#include "../../events/intel/uncore.h"
 
 /* Uncore IMC PCI IDs */
 #define PCI_DEVICE_ID_INTEL_SNB_IMC	0x0100
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 33acb884ccf1..188e18a1f224 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -1,6 +1,5 @@
 /* SandyBridge-EP/IvyTown uncore support */
-#include "perf_event_intel_uncore.h"
-
+#include "../../events/intel/uncore.h"
 
 /* SNB-EP Box level control */
 #define SNBEP_PMON_BOX_CTL_RST_CTRL	(1 << 0)
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 10/17] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (8 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 09/17] perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch] Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:20   ` [tip:perf/core] " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 11/17] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c Borislav Petkov
                   ` (6 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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 +-
 .../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(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore_nhmex.c => events/intel/uncore_nhmex.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index aae3e530e2ee..70aedfea45b4 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 d70cfe0be86a..e89bf5c536e0 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 14304dc68719..1a8a8d9444d6 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
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 11/17] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (9 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 10/17] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:21   ` [tip:perf/core] " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 12/17] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c Borislav Petkov
                   ` (5 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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                                               | 1 +
 .../cpu/perf_event_intel_uncore_snb.c => events/intel/uncore_snb.c}    | 2 +-
 arch/x86/kernel/cpu/Makefile                                           | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snb.c => events/intel/uncore_snb.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 70aedfea45b4..eb0d92198a56 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -9,3 +9,4 @@ 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 intel/uncore_nhmex.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
rename to arch/x86/events/intel/uncore_snb.c
index e0e41f55a20c..2049d26a7ae6 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -1,5 +1,5 @@
 /* Nehalem/SandBridge/Haswell uncore support */
-#include "../../events/intel/uncore.h"
+#include "uncore.h"
 
 /* Uncore IMC PCI IDs */
 #define PCI_DEVICE_ID_INTEL_SNB_IMC	0x0100
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 1a8a8d9444d6..155205de6546 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -33,8 +33,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_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore_snb.o \
-					   perf_event_intel_uncore_snbep.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= 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
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 12/17] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (10 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 11/17] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:21   ` [tip:perf/core] " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 13/17] perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c Borislav Petkov
                   ` (4 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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 +-
 .../cpu/perf_event_intel_uncore_snbep.c => events/intel/uncore_snbep.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                            | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snbep.c => events/intel/uncore_snbep.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index eb0d92198a56..8c939ca26f6d 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -9,4 +9,4 @@ 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 intel/uncore_nhmex.o
-obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
rename to arch/x86/events/intel/uncore_snbep.c
index 188e18a1f224..0c801f77c03d 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -1,5 +1,5 @@
 /* SandyBridge-EP/IvyTown uncore support */
-#include "../../events/intel/uncore.h"
+#include "uncore.h"
 
 /* SNB-EP Box level control */
 #define SNBEP_PMON_BOX_CTL_RST_CTRL	(1 << 0)
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 155205de6546..0c1911481ebb 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_PERF_EVENTS_INTEL_UNCORE)	+= 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
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 13/17] perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (11 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 12/17] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:22   ` [tip:perf/core] perf/x86: Move perf_event_knc.c .............. " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 14/17] perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c Borislav Petkov
                   ` (3 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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                                     | 4 ++--
 arch/x86/{kernel/cpu/perf_event_knc.c => events/intel/knc.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_knc.c => events/intel/knc.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 8c939ca26f6d..c1647a65bf1c 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,7 +6,7 @@ ifdef CONFIG_AMD_IOMMU
 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 intel/rapl.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/cstate.o intel/ds.o intel/knc.o 
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/pt.o intel/rapl.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_knc.c b/arch/x86/events/intel/knc.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_knc.c
rename to arch/x86/events/intel/knc.c
index 5b0c232d1ee6..630bcba91b16 100644
--- a/arch/x86/kernel/cpu/perf_event_knc.c
+++ b/arch/x86/events/intel/knc.c
@@ -5,7 +5,7 @@
 
 #include <asm/hardirq.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 static const u64 knc_perfmon_event_map[] =
 {
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 0c1911481ebb..75e017f0dcfd 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 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_p6.o perf_event_p4.o
 
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 14/17] perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (12 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 13/17] perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:22   ` [tip:perf/core] perf/x86: Move perf_event_p4.c ............... " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 15/17] perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c Borislav Petkov
                   ` (2 subsequent siblings)
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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                                   | 3 ++-
 arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index c1647a65bf1c..5a6f20d3f3ea 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -7,6 +7,7 @@ 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/knc.o 
-obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/pt.o intel/rapl.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/pt.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/events/intel/p4.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_p4.c
rename to arch/x86/events/intel/p4.c
index f2e56783af3d..1c72fedd96d3 100644
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/events/intel/p4.c
@@ -13,7 +13,7 @@
 #include <asm/hardirq.h>
 #include <asm/apic.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define P4_CNTR_LIMIT 3
 /*
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 75e017f0dcfd..4290f1083885 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o perf_event_p4.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o
 
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 15/17] perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (13 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 14/17] perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:23   ` [tip:perf/core] perf/x86: Move perf_event_p6.c ............... " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 16/17] perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c Borislav Petkov
  2016-02-10  9:55 ` [PATCH 17/17] perf/x86: Move perf_event.h to its new home Borislav Petkov
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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_p6.c => events/intel/p6.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                               | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} (99%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 5a6f20d3f3ea..b4e80d02a78a 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -7,7 +7,7 @@ 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/knc.o 
-obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/pt.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/p6.o intel/pt.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/events/intel/p6.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_p6.c
rename to arch/x86/events/intel/p6.c
index 7c1a0c07b607..ee5c4e8bd556 100644
--- a/arch/x86/kernel/cpu/perf_event_p6.c
+++ b/arch/x86/events/intel/p6.c
@@ -1,7 +1,7 @@
 #include <linux/perf_event.h>
 #include <linux/types.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 /*
  * Not sure about some of these
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 4290f1083885..662cab77ade9 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,8 +31,6 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o
-
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o
 endif
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 16/17] perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (14 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 15/17] perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:23   ` [tip:perf/core] perf/x86: Move perf_event_msr.c .............. " tip-bot for Borislav Petkov
  2016-02-10  9:55 ` [PATCH 17/17] perf/x86: Move perf_event.h to its new home Borislav Petkov
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

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                               | 4 ++--
 arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c} | 0
 arch/x86/kernel/cpu/Makefile                           | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c} (100%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index b4e80d02a78a..fdfea1511cc0 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1,13 +1,13 @@
 obj-y			+= core.o
 
 obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o amd/uncore.o
-obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o
+obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o msr.o
 ifdef CONFIG_AMD_IOMMU
 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/knc.o 
 obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/p6.o intel/pt.o
-obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o msr.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_msr.c b/arch/x86/events/msr.c
similarity index 100%
rename from arch/x86/kernel/cpu/perf_event_msr.c
rename to arch/x86/events/msr.c
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 662cab77ade9..0d373d7affc8 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -30,12 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centaur.o
 obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
-ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
-obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o
-endif
-
-
 obj-$(CONFIG_X86_MCE)			+= mcheck/
 obj-$(CONFIG_MTRR)			+= mtrr/
 obj-$(CONFIG_MICROCODE)			+= microcode/
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [PATCH 17/17] perf/x86: Move perf_event.h to its new home
  2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
                   ` (15 preceding siblings ...)
  2016-02-10  9:55 ` [PATCH 16/17] perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c Borislav Petkov
@ 2016-02-10  9:55 ` Borislav Petkov
  2016-02-17 12:23   ` [tip:perf/core] " tip-bot for Borislav Petkov
  16 siblings, 1 reply; 35+ messages in thread
From: Borislav Petkov @ 2016-02-10  9:55 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: X86 ML, LKML

From: Borislav Petkov <bp@suse.de>

Now that all functionality has been moved to arch/x86/events/, move the
perf_event.h header and adjust include paths.

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/amd/core.c                   | 2 +-
 arch/x86/events/amd/ibs.c                    | 2 +-
 arch/x86/events/amd/iommu.c                  | 2 +-
 arch/x86/events/core.c                       | 2 +-
 arch/x86/events/intel/bts.c                  | 2 +-
 arch/x86/events/intel/core.c                 | 2 +-
 arch/x86/events/intel/cqm.c                  | 2 +-
 arch/x86/events/intel/cstate.c               | 2 +-
 arch/x86/events/intel/ds.c                   | 2 +-
 arch/x86/events/intel/knc.c                  | 2 +-
 arch/x86/events/intel/lbr.c                  | 2 +-
 arch/x86/events/intel/p4.c                   | 2 +-
 arch/x86/events/intel/p6.c                   | 2 +-
 arch/x86/events/intel/pt.c                   | 2 +-
 arch/x86/events/intel/rapl.c                 | 2 +-
 arch/x86/events/intel/uncore.h               | 2 +-
 arch/x86/{kernel/cpu => events}/perf_event.h | 0
 arch/x86/xen/pmu.c                           | 2 +-
 18 files changed, 17 insertions(+), 17 deletions(-)
 rename arch/x86/{kernel/cpu => events}/perf_event.h (100%)

diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c
index 51b16583679c..049ada8d4e9c 100644
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -5,7 +5,7 @@
 #include <linux/slab.h>
 #include <asm/apicdef.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 static __initconst const u64 amd_hw_cache_event_ids
 				[PERF_COUNT_HW_CACHE_MAX]
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index a8abd082d932..51087c29b2c2 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -14,7 +14,7 @@
 
 #include <asm/apic.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 static u32 ibs_caps;
 
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index 629bc700eb08..635e5eba0caf 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -16,7 +16,7 @@
 #include <linux/cpumask.h>
 #include <linux/slab.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 #include "iommu.h"
 
 #define COUNTER_SHIFT		16
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 90ca601b5d5c..7402c8182813 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -37,7 +37,7 @@
 #include <asm/desc.h>
 #include <asm/ldt.h>
 
-#include "../kernel/cpu/perf_event.h"
+#include "perf_event.h"
 
 struct x86_pmu x86_pmu __read_mostly;
 
diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c
index 2bd4833367a7..b99dc9258c0f 100644
--- a/arch/x86/events/intel/bts.c
+++ b/arch/x86/events/intel/bts.c
@@ -26,7 +26,7 @@
 #include <asm-generic/sizes.h>
 #include <asm/perf_event.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 struct bts_ctx {
 	struct perf_output_handle	handle;
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 1edf3013e528..a7ec685657a5 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -18,7 +18,7 @@
 #include <asm/hardirq.h>
 #include <asm/apic.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /*
  * Intel PerfMon, used on Core and later.
diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c
index d1b623a15ac0..1b064c430140 100644
--- a/arch/x86/events/intel/cqm.c
+++ b/arch/x86/events/intel/cqm.c
@@ -7,7 +7,7 @@
 #include <linux/perf_event.h>
 #include <linux/slab.h>
 #include <asm/cpu_device_id.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define MSR_IA32_PQR_ASSOC	0x0c8f
 #define MSR_IA32_QM_CTR		0x0c8e
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 1bbf37e8604b..7946c4231169 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -89,7 +89,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format)		\
 static ssize_t __cstate_##_var##_show(struct kobject *kobj,	\
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index 9677207a2ab1..c8a243d6fc82 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -5,7 +5,7 @@
 #include <asm/perf_event.h>
 #include <asm/insn.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /* The size of a BTS record in bytes: */
 #define BTS_RECORD_SIZE		24
diff --git a/arch/x86/events/intel/knc.c b/arch/x86/events/intel/knc.c
index 630bcba91b16..206226e08f49 100644
--- a/arch/x86/events/intel/knc.c
+++ b/arch/x86/events/intel/knc.c
@@ -5,7 +5,7 @@
 
 #include <asm/hardirq.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 static const u64 knc_perfmon_event_map[] =
 {
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 78c88f9293cc..69dd11887dd1 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -5,7 +5,7 @@
 #include <asm/msr.h>
 #include <asm/insn.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 enum {
 	LBR_FORMAT_32		= 0x00,
diff --git a/arch/x86/events/intel/p4.c b/arch/x86/events/intel/p4.c
index 1c72fedd96d3..0a5ede187d9c 100644
--- a/arch/x86/events/intel/p4.c
+++ b/arch/x86/events/intel/p4.c
@@ -13,7 +13,7 @@
 #include <asm/hardirq.h>
 #include <asm/apic.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define P4_CNTR_LIMIT 3
 /*
diff --git a/arch/x86/events/intel/p6.c b/arch/x86/events/intel/p6.c
index ee5c4e8bd556..1f5c47ab4c65 100644
--- a/arch/x86/events/intel/p6.c
+++ b/arch/x86/events/intel/p6.c
@@ -1,7 +1,7 @@
 #include <linux/perf_event.h>
 #include <linux/types.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /*
  * Not sure about some of these
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index e56cebe07994..6af7cf71d6b2 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -29,7 +29,7 @@
 #include <asm/io.h>
 #include <asm/intel_pt.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 #include "pt.h"
 
 static DEFINE_PER_CPU(struct pt, pt_ctx);
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 9541f50a534a..580f504ec27c 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -48,7 +48,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /*
  * RAPL energy status counters
diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h
index 1dea2046990a..6a1340c7f3cc 100644
--- a/arch/x86/events/intel/uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -2,7 +2,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/perf_event.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define UNCORE_PMU_NAME_LEN		32
 #define UNCORE_PMU_HRTIMER_INTERVAL	(60LL * NSEC_PER_SEC)
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/events/perf_event.h
similarity index 100%
rename from arch/x86/kernel/cpu/perf_event.h
rename to arch/x86/events/perf_event.h
diff --git a/arch/x86/xen/pmu.c b/arch/x86/xen/pmu.c
index 724a08740a04..9466354d3e49 100644
--- a/arch/x86/xen/pmu.c
+++ b/arch/x86/xen/pmu.c
@@ -11,7 +11,7 @@
 #include "pmu.h"
 
 /* x86_pmu.handle_irq definition */
-#include "../kernel/cpu/perf_event.h"
+#include "../events/perf_event.h"
 
 #define XENPMU_IRQ_PROCESSING    1
 struct xenpmu {
-- 
2.3.5

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c
  2016-02-10  9:55 ` [PATCH 01/17] perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c Borislav Petkov
@ 2016-02-17 12:16   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:16 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: tglx, acme, torvalds, linux-kernel, bp, mingo, vincent.weaver,
	hpa, jolsa, a.p.zijlstra, eranian, peterz

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

perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c

Start moving the Intel bits.

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-2-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                           | 1 +
 arch/x86/{kernel/cpu/perf_event_intel_bts.c => events/intel/bts.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 7d1ecff..bcd1e21 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -5,3 +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
diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/events/intel/bts.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_bts.c
rename to arch/x86/events/intel/bts.c
index 2cad71d..2bd4833 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
+++ b/arch/x86/events/intel/bts.c
@@ -26,7 +26,7 @@
 #include <asm-generic/sizes.h>
 #include <asm/perf_event.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 struct bts_ctx {
 	struct perf_output_handle	handle;
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 7edbeb9..e28f931 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -34,7 +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_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_rapl.o perf_event_intel_cqm.o
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o perf_event_intel_bts.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o
 
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.c
  2016-02-10  9:55 ` [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c Borislav Petkov
@ 2016-02-17 12:17   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:17 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: a.p.zijlstra, linux-kernel, hpa, peterz, bp, tglx, acme, jolsa,
	mingo, vincent.weaver, eranian, torvalds

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

perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.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-3-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index bcd1e21..834e9ae 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 fed2ab1..1edf301 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 e28f931..0a27243 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

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_cqm.c ........ => x86/events/intel/cqm.c
  2016-02-10  9:55 ` [PATCH 03/17] perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c Borislav Petkov
@ 2016-02-17 12:17   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:17 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: hpa, linux-kernel, vincent.weaver, eranian, jolsa, a.p.zijlstra,
	tglx, peterz, acme, bp, mingo, torvalds

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

perf/x86: Move perf_event_intel_cqm.c ........ => x86/events/intel/cqm.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-4-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                           | 2 +-
 arch/x86/{kernel/cpu/perf_event_intel_cqm.c => events/intel/cqm.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 834e9ae..f97c283 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/core.o intel/bts.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/core.o intel/bts.o intel/cqm.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/events/intel/cqm.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_cqm.c
rename to arch/x86/events/intel/cqm.c
index a316ca9..d1b623a 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
+++ b/arch/x86/events/intel/cqm.c
@@ -7,7 +7,7 @@
 #include <linux/perf_event.h>
 #include <linux/slab.h>
 #include <asm/cpu_device_id.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define MSR_IA32_PQR_ASSOC	0x0c8f
 #define MSR_IA32_QM_CTR		0x0c8e
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 0a27243..64781cf 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -33,7 +33,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
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o perf_event_intel_cqm.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o
 

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_cstate.c ..... => x86/events/intel/cstate.c
  2016-02-10  9:55 ` [PATCH 04/17] perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c Borislav Petkov
@ 2016-02-17 12:18   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:18 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: linux-kernel, hpa, vincent.weaver, eranian, a.p.zijlstra, peterz,
	mingo, acme, jolsa, bp, torvalds, tglx

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

perf/x86: Move perf_event_intel_cstate.c ..... => x86/events/intel/cstate.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-5-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                                | 1 +
 .../x86/{kernel/cpu/perf_event_intel_cstate.c => events/intel/cstate.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                            | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index f97c283..e0a70fe 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,3 +6,4 @@ ifdef CONFIG_AMD_IOMMU
 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
diff --git a/arch/x86/kernel/cpu/perf_event_intel_cstate.c b/arch/x86/events/intel/cstate.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_cstate.c
rename to arch/x86/events/intel/cstate.c
index 75a38b5..1bbf37e 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -89,7 +89,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format)		\
 static ssize_t __cstate_##_var##_show(struct kobject *kobj,	\
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 64781cf..1bc881b 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -35,7 +35,6 @@ 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
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o
 
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
 					   perf_event_intel_uncore_snb.o \

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_ds.c ......... => x86/events/intel/ds.c
  2016-02-10  9:55 ` [PATCH 05/17] perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c Borislav Petkov
@ 2016-02-17 12:18   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:18 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: vincent.weaver, torvalds, eranian, hpa, acme, jolsa, bp, peterz,
	tglx, a.p.zijlstra, linux-kernel, mingo

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

perf/x86: Move perf_event_intel_ds.c ......... => x86/events/intel/ds.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-6-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                         | 2 +-
 arch/x86/{kernel/cpu/perf_event_intel_ds.c => events/intel/ds.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index e0a70fe..c4d41b6 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,4 +6,4 @@ ifdef CONFIG_AMD_IOMMU
 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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/cstate.o intel/ds.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/events/intel/ds.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_ds.c
rename to arch/x86/events/intel/ds.c
index 7c79261..9677207 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -5,7 +5,7 @@
 #include <asm/perf_event.h>
 #include <asm/insn.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 /* The size of a BTS record in bytes: */
 #define BTS_RECORD_SIZE		24
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 1bc881b..035bdb6 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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_lbr.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_lbr.c ........ => x86/events/intel/lbr.c
  2016-02-10  9:55 ` [PATCH 06/17] perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c Borislav Petkov
@ 2016-02-17 12:18   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:18 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: torvalds, vincent.weaver, eranian, acme, tglx, linux-kernel,
	peterz, a.p.zijlstra, mingo, jolsa, bp, hpa

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

perf/x86: Move perf_event_intel_lbr.c ........ => x86/events/intel/lbr.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-7-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                           | 2 +-
 arch/x86/{kernel/cpu/perf_event_intel_lbr.c => events/intel/lbr.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                       | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index c4d41b6..48097fd 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,4 +6,4 @@ ifdef CONFIG_AMD_IOMMU
 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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/cstate.o intel/ds.o intel/lbr.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/events/intel/lbr.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_lbr.c
rename to arch/x86/events/intel/lbr.c
index 653f88d..78c88f9 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -5,7 +5,7 @@
 #include <asm/msr.h>
 #include <asm/insn.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 enum {
 	LBR_FORMAT_32		= 0x00,
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 035bdb6..d52ed9b 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -32,7 +32,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_lbr.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o
 

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch]
  2016-02-10  9:55 ` [PATCH 07/17] perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch] Borislav Petkov
@ 2016-02-17 12:19   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:19 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: mingo, hpa, tglx, bp, a.p.zijlstra, jolsa, acme, linux-kernel,
	torvalds, vincent.weaver, eranian, peterz

Commit-ID:  fd1c601c25785ef38d698ff0091b5fe253074715
Gitweb:     http://git.kernel.org/tip/fd1c601c25785ef38d698ff0091b5fe253074715
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 10 Feb 2016 10:55:13 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
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 <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-8-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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 <asm/io.h>
 #include <asm/intel_pt.h>
 
-#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 \

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.c
  2016-02-10  9:55 ` [PATCH 08/17] perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c Borislav Petkov
@ 2016-02-17 12:19   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:19 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: bp, peterz, linux-kernel, vincent.weaver, torvalds, jolsa,
	a.p.zijlstra, acme, mingo, eranian, tglx, hpa

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

perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.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-9-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                             | 2 +-
 arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                         | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 2a2f55d..f68232c 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -7,4 +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
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/pt.o intel/rapl.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/events/intel/rapl.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_rapl.c
rename to arch/x86/events/intel/rapl.c
index 24a351a..9541f50 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -48,7 +48,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 /*
  * RAPL energy status counters
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 595e3ff..018451a 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -32,7 +32,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_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
 					   perf_event_intel_uncore_snb.o \

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_uncore.[ch] .. => x86/events/intel/uncore.[ch]
  2016-02-10  9:55 ` [PATCH 09/17] perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch] Borislav Petkov
@ 2016-02-17 12:20   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:20 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: tglx, eranian, linux-kernel, hpa, bp, peterz, torvalds, mingo,
	vincent.weaver, jolsa, acme, a.p.zijlstra

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

perf/x86: Move perf_event_intel_uncore.[ch] .. => x86/events/intel/uncore.[ch]

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-10-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                               | 1 +
 .../{kernel/cpu/perf_event_intel_uncore.c => events/intel/uncore.c}    | 2 +-
 .../{kernel/cpu/perf_event_intel_uncore.h => events/intel/uncore.h}    | 2 +-
 arch/x86/kernel/cpu/Makefile                                           | 3 +--
 arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c                    | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c                      | 2 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c                    | 3 +--
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index f68232c..aae3e53 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -8,3 +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
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/events/intel/uncore.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore.c
rename to arch/x86/events/intel/uncore.c
index 3bf41d4..91a18d6 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -1,4 +1,4 @@
-#include "perf_event_intel_uncore.h"
+#include "uncore.h"
 
 static struct intel_uncore_type *empty_uncore[] = { NULL, };
 struct intel_uncore_type **uncore_msr_uncores = empty_uncore;
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/events/intel/uncore.h
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore.h
rename to arch/x86/events/intel/uncore.h
index a7086b8..1dea204 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -2,7 +2,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/perf_event.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define UNCORE_PMU_NAME_LEN		32
 #define UNCORE_PMU_HRTIMER_INTERVAL	(60LL * NSEC_PER_SEC)
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 018451a..875d1b1 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -33,8 +33,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_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \
-					   perf_event_intel_uncore_snb.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
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
index 2749965..d70cfe0 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c
@@ -1,5 +1,5 @@
 /* Nehalem-EX/Westmere-EX uncore support */
-#include "perf_event_intel_uncore.h"
+#include "../../events/intel/uncore.h"
 
 /* NHM-EX event control */
 #define NHMEX_PMON_CTL_EV_SEL_MASK	0x000000ff
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
index 2bd030d..e0e41f5 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
@@ -1,5 +1,5 @@
 /* Nehalem/SandBridge/Haswell uncore support */
-#include "perf_event_intel_uncore.h"
+#include "../../events/intel/uncore.h"
 
 /* Uncore IMC PCI IDs */
 #define PCI_DEVICE_ID_INTEL_SNB_IMC	0x0100
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 33acb88..188e18a 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -1,6 +1,5 @@
 /* SandyBridge-EP/IvyTown uncore support */
-#include "perf_event_intel_uncore.h"
-
+#include "../../events/intel/uncore.h"
 
 /* SNB-EP Box level control */
 #define SNBEP_PMON_BOX_CTL_RST_CTRL	(1 << 0)

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
  2016-02-10  9:55 ` [PATCH 10/17] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Borislav Petkov
@ 2016-02-17 12:20   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:20 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, mingo, peterz, torvalds, eranian, linux-kernel, jolsa,
	vincent.weaver, a.p.zijlstra, bp, hpa, tglx

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

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_uncore_snb.c   => x86/events/intel/uncore_snb.c
  2016-02-10  9:55 ` [PATCH 11/17] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c Borislav Petkov
@ 2016-02-17 12:21   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:21 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: tglx, peterz, linux-kernel, torvalds, mingo, hpa, acme, eranian,
	a.p.zijlstra, vincent.weaver, jolsa, bp

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

perf/x86: Move perf_event_intel_uncore_snb.c   => x86/events/intel/uncore_snb.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-12-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                               | 1 +
 .../cpu/perf_event_intel_uncore_snb.c => events/intel/uncore_snb.c}    | 2 +-
 arch/x86/kernel/cpu/Makefile                                           | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 70aedfe..eb0d921 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -9,3 +9,4 @@ 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 intel/uncore_nhmex.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
rename to arch/x86/events/intel/uncore_snb.c
index e0e41f5..2049d26 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -1,5 +1,5 @@
 /* Nehalem/SandBridge/Haswell uncore support */
-#include "../../events/intel/uncore.h"
+#include "uncore.h"
 
 /* Uncore IMC PCI IDs */
 #define PCI_DEVICE_ID_INTEL_SNB_IMC	0x0100
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 316f53a..696d106 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -33,8 +33,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_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore_snb.o \
-					   perf_event_intel_uncore_snbep.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= 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

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
  2016-02-10  9:55 ` [PATCH 12/17] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c Borislav Petkov
@ 2016-02-17 12:21   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:21 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: torvalds, vincent.weaver, acme, tglx, a.p.zijlstra, hpa, jolsa,
	peterz, bp, eranian, linux-kernel, mingo

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

perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.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-13-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                                | 2 +-
 .../cpu/perf_event_intel_uncore_snbep.c => events/intel/uncore_snbep.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                            | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index eb0d921..8c939ca 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -9,4 +9,4 @@ 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 intel/uncore_nhmex.o
-obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
rename to arch/x86/events/intel/uncore_snbep.c
index 188e18a..0c801f7 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -1,5 +1,5 @@
 /* SandyBridge-EP/IvyTown uncore support */
-#include "../../events/intel/uncore.h"
+#include "uncore.h"
 
 /* SNB-EP Box level control */
 #define SNBEP_PMON_BOX_CTL_RST_CTRL	(1 << 0)
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 696d106..973b77b 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_PERF_EVENTS_INTEL_UNCORE)	+= 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

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_knc.c .............. => x86/events/intel/knc.c
  2016-02-10  9:55 ` [PATCH 13/17] perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c Borislav Petkov
@ 2016-02-17 12:22   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:22 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: bp, vincent.weaver, eranian, acme, torvalds, peterz, hpa, tglx,
	mingo, jolsa, a.p.zijlstra, linux-kernel

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

perf/x86: Move perf_event_knc.c .............. => x86/events/intel/knc.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-14-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                     | 4 ++--
 arch/x86/{kernel/cpu/perf_event_knc.c => events/intel/knc.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 8c939ca..c1647a6 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -6,7 +6,7 @@ ifdef CONFIG_AMD_IOMMU
 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 intel/rapl.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/cstate.o intel/ds.o intel/knc.o 
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/pt.o intel/rapl.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_knc.c b/arch/x86/events/intel/knc.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_knc.c
rename to arch/x86/events/intel/knc.c
index 5b0c232..630bcba 100644
--- a/arch/x86/kernel/cpu/perf_event_knc.c
+++ b/arch/x86/events/intel/knc.c
@@ -5,7 +5,7 @@
 
 #include <asm/hardirq.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 static const u64 knc_perfmon_event_map[] =
 {
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 973b77b..3195f7d 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 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_p6.o perf_event_p4.o
 
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_p4.c ............... => x86/events/intel/p4.c
  2016-02-10  9:55 ` [PATCH 14/17] perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c Borislav Petkov
@ 2016-02-17 12:22   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:22 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, peterz, a.p.zijlstra, torvalds, mingo, linux-kernel, bp,
	eranian, hpa, tglx, jolsa, vincent.weaver

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

perf/x86: Move perf_event_p4.c ............... => x86/events/intel/p4.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-15-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                   | 3 ++-
 arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index c1647a6..5a6f20d 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -7,6 +7,7 @@ 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/knc.o 
-obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/pt.o intel/rapl.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/pt.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/events/intel/p4.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_p4.c
rename to arch/x86/events/intel/p4.c
index f2e5678..1c72fed 100644
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/events/intel/p4.c
@@ -13,7 +13,7 @@
 #include <asm/hardirq.h>
 #include <asm/apic.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 #define P4_CNTR_LIMIT 3
 /*
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 3195f7d..2bb41d0 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o perf_event_p4.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o
 
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.c
  2016-02-10  9:55 ` [PATCH 15/17] perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c Borislav Petkov
@ 2016-02-17 12:23   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:23 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, bp, hpa, peterz, tglx, a.p.zijlstra, torvalds, eranian,
	linux-kernel, mingo, vincent.weaver, jolsa

Commit-ID:  5e865ed44b39fa991a8fb1d7d9c0338f8fedac33
Gitweb:     http://git.kernel.org/tip/5e865ed44b39fa991a8fb1d7d9c0338f8fedac33
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 10 Feb 2016 10:55:21 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 17 Feb 2016 10:11:36 +0100

perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.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-16-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                                   | 2 +-
 arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} | 2 +-
 arch/x86/kernel/cpu/Makefile                               | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 5a6f20d..b4e80d02 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -7,7 +7,7 @@ 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/knc.o 
-obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/pt.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/p6.o intel/pt.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/events/intel/p6.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_p6.c
rename to arch/x86/events/intel/p6.c
index 7c1a0c0..ee5c4e8 100644
--- a/arch/x86/kernel/cpu/perf_event_p6.c
+++ b/arch/x86/events/intel/p6.c
@@ -1,7 +1,7 @@
 #include <linux/perf_event.h>
 #include <linux/types.h>
 
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
 
 /*
  * Not sure about some of these
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 2bb41d0..5cc09fc 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,8 +31,6 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
 ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o
-
 obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
 obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o
 endif

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event_msr.c .............. => x86/events/msr.c
  2016-02-10  9:55 ` [PATCH 16/17] perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c Borislav Petkov
@ 2016-02-17 12:23   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:23 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: jolsa, a.p.zijlstra, bp, linux-kernel, eranian, mingo, acme,
	tglx, hpa, vincent.weaver, torvalds, peterz

Commit-ID:  65a27a3510c82f16e673548b4c819462fabb12ae
Gitweb:     http://git.kernel.org/tip/65a27a3510c82f16e673548b4c819462fabb12ae
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 10 Feb 2016 10:55:22 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 17 Feb 2016 10:11:36 +0100

perf/x86: Move perf_event_msr.c .............. => x86/events/msr.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-17-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/Makefile                               | 4 ++--
 arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c} | 0
 arch/x86/kernel/cpu/Makefile                           | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index b4e80d02..fdfea15 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1,13 +1,13 @@
 obj-y			+= core.o
 
 obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o amd/uncore.o
-obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o
+obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o msr.o
 ifdef CONFIG_AMD_IOMMU
 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/knc.o 
 obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/lbr.o intel/p4.o intel/p6.o intel/pt.o
-obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o
+obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/rapl.o msr.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore.o intel/uncore_nhmex.o
 obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= intel/uncore_snb.o intel/uncore_snbep.o
diff --git a/arch/x86/kernel/cpu/perf_event_msr.c b/arch/x86/events/msr.c
similarity index 100%
rename from arch/x86/kernel/cpu/perf_event_msr.c
rename to arch/x86/events/msr.c
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 5cc09fc..7a60424 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -30,12 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR)		+= centaur.o
 obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o
 obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 
-ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_msr.o
-obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_msr.o
-endif
-
-
 obj-$(CONFIG_X86_MCE)			+= mcheck/
 obj-$(CONFIG_MTRR)			+= mtrr/
 obj-$(CONFIG_MICROCODE)			+= microcode/

^ permalink raw reply related	[flat|nested] 35+ messages in thread

* [tip:perf/core] perf/x86: Move perf_event.h to its new home
  2016-02-10  9:55 ` [PATCH 17/17] perf/x86: Move perf_event.h to its new home Borislav Petkov
@ 2016-02-17 12:23   ` tip-bot for Borislav Petkov
  0 siblings, 0 replies; 35+ messages in thread
From: tip-bot for Borislav Petkov @ 2016-02-17 12:23 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: eranian, a.p.zijlstra, tglx, jolsa, peterz, bp, acme, mingo,
	vincent.weaver, hpa, linux-kernel, torvalds

Commit-ID:  27f6d22b037b2be6685e0e27cce929779d634119
Gitweb:     http://git.kernel.org/tip/27f6d22b037b2be6685e0e27cce929779d634119
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 10 Feb 2016 10:55:23 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 17 Feb 2016 10:11:36 +0100

perf/x86: Move perf_event.h to its new home

Now that all functionality has been moved to arch/x86/events/, move the
perf_event.h header and adjust include paths.

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-18-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/events/amd/core.c                   | 2 +-
 arch/x86/events/amd/ibs.c                    | 2 +-
 arch/x86/events/amd/iommu.c                  | 2 +-
 arch/x86/events/core.c                       | 2 +-
 arch/x86/events/intel/bts.c                  | 2 +-
 arch/x86/events/intel/core.c                 | 2 +-
 arch/x86/events/intel/cqm.c                  | 2 +-
 arch/x86/events/intel/cstate.c               | 2 +-
 arch/x86/events/intel/ds.c                   | 2 +-
 arch/x86/events/intel/knc.c                  | 2 +-
 arch/x86/events/intel/lbr.c                  | 2 +-
 arch/x86/events/intel/p4.c                   | 2 +-
 arch/x86/events/intel/p6.c                   | 2 +-
 arch/x86/events/intel/pt.c                   | 2 +-
 arch/x86/events/intel/rapl.c                 | 2 +-
 arch/x86/events/intel/uncore.h               | 2 +-
 arch/x86/{kernel/cpu => events}/perf_event.h | 0
 arch/x86/xen/pmu.c                           | 2 +-
 18 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c
index 51b1658..049ada8d 100644
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -5,7 +5,7 @@
 #include <linux/slab.h>
 #include <asm/apicdef.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 static __initconst const u64 amd_hw_cache_event_ids
 				[PERF_COUNT_HW_CACHE_MAX]
diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c
index a8abd08..51087c2 100644
--- a/arch/x86/events/amd/ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -14,7 +14,7 @@
 
 #include <asm/apic.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 static u32 ibs_caps;
 
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index 629bc70..635e5eb 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -16,7 +16,7 @@
 #include <linux/cpumask.h>
 #include <linux/slab.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 #include "iommu.h"
 
 #define COUNTER_SHIFT		16
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 90ca601..7402c818 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -37,7 +37,7 @@
 #include <asm/desc.h>
 #include <asm/ldt.h>
 
-#include "../kernel/cpu/perf_event.h"
+#include "perf_event.h"
 
 struct x86_pmu x86_pmu __read_mostly;
 
diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c
index 2bd4833..b99dc92 100644
--- a/arch/x86/events/intel/bts.c
+++ b/arch/x86/events/intel/bts.c
@@ -26,7 +26,7 @@
 #include <asm-generic/sizes.h>
 #include <asm/perf_event.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 struct bts_ctx {
 	struct perf_output_handle	handle;
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 1edf301..a7ec685 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -18,7 +18,7 @@
 #include <asm/hardirq.h>
 #include <asm/apic.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /*
  * Intel PerfMon, used on Core and later.
diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c
index d1b623a..1b064c4 100644
--- a/arch/x86/events/intel/cqm.c
+++ b/arch/x86/events/intel/cqm.c
@@ -7,7 +7,7 @@
 #include <linux/perf_event.h>
 #include <linux/slab.h>
 #include <asm/cpu_device_id.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define MSR_IA32_PQR_ASSOC	0x0c8f
 #define MSR_IA32_QM_CTR		0x0c8e
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 1bbf37e..7946c42 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -89,7 +89,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format)		\
 static ssize_t __cstate_##_var##_show(struct kobject *kobj,	\
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index 9677207..c8a243d 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -5,7 +5,7 @@
 #include <asm/perf_event.h>
 #include <asm/insn.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /* The size of a BTS record in bytes: */
 #define BTS_RECORD_SIZE		24
diff --git a/arch/x86/events/intel/knc.c b/arch/x86/events/intel/knc.c
index 630bcba..206226e 100644
--- a/arch/x86/events/intel/knc.c
+++ b/arch/x86/events/intel/knc.c
@@ -5,7 +5,7 @@
 
 #include <asm/hardirq.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 static const u64 knc_perfmon_event_map[] =
 {
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 78c88f9..69dd118 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -5,7 +5,7 @@
 #include <asm/msr.h>
 #include <asm/insn.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 enum {
 	LBR_FORMAT_32		= 0x00,
diff --git a/arch/x86/events/intel/p4.c b/arch/x86/events/intel/p4.c
index 1c72fed..0a5ede1 100644
--- a/arch/x86/events/intel/p4.c
+++ b/arch/x86/events/intel/p4.c
@@ -13,7 +13,7 @@
 #include <asm/hardirq.h>
 #include <asm/apic.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define P4_CNTR_LIMIT 3
 /*
diff --git a/arch/x86/events/intel/p6.c b/arch/x86/events/intel/p6.c
index ee5c4e8..1f5c47a 100644
--- a/arch/x86/events/intel/p6.c
+++ b/arch/x86/events/intel/p6.c
@@ -1,7 +1,7 @@
 #include <linux/perf_event.h>
 #include <linux/types.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /*
  * Not sure about some of these
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index e56cebe..6af7cf7 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -29,7 +29,7 @@
 #include <asm/io.h>
 #include <asm/intel_pt.h>
 
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 #include "pt.h"
 
 static DEFINE_PER_CPU(struct pt, pt_ctx);
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 9541f50..580f504 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -48,7 +48,7 @@
 #include <linux/slab.h>
 #include <linux/perf_event.h>
 #include <asm/cpu_device_id.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 /*
  * RAPL energy status counters
diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h
index 1dea204..6a1340c 100644
--- a/arch/x86/events/intel/uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -2,7 +2,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/perf_event.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
 
 #define UNCORE_PMU_NAME_LEN		32
 #define UNCORE_PMU_HRTIMER_INTERVAL	(60LL * NSEC_PER_SEC)
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/events/perf_event.h
similarity index 100%
rename from arch/x86/kernel/cpu/perf_event.h
rename to arch/x86/events/perf_event.h
diff --git a/arch/x86/xen/pmu.c b/arch/x86/xen/pmu.c
index 724a087..9466354 100644
--- a/arch/x86/xen/pmu.c
+++ b/arch/x86/xen/pmu.c
@@ -11,7 +11,7 @@
 #include "pmu.h"
 
 /* x86_pmu.handle_irq definition */
-#include "../kernel/cpu/perf_event.h"
+#include "../events/perf_event.h"
 
 #define XENPMU_IRQ_PROCESSING    1
 struct xenpmu {

^ permalink raw reply related	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2016-02-17 12:29 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-10  9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
2016-02-10  9:55 ` [PATCH 01/17] perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c Borislav Petkov
2016-02-17 12:16   ` [tip:perf/core] perf/x86: Move perf_event_intel_bts.c ........ " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c Borislav Petkov
2016-02-17 12:17   ` [tip:perf/core] perf/x86: Move perf_event_intel.c ............ " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 03/17] perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c Borislav Petkov
2016-02-17 12:17   ` [tip:perf/core] perf/x86: Move perf_event_intel_cqm.c ........ " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 04/17] perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c Borislav Petkov
2016-02-17 12:18   ` [tip:perf/core] perf/x86: Move perf_event_intel_cstate.c ..... " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 05/17] perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c Borislav Petkov
2016-02-17 12:18   ` [tip:perf/core] perf/x86: Move perf_event_intel_ds.c ......... " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 06/17] perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c Borislav Petkov
2016-02-17 12:18   ` [tip:perf/core] perf/x86: Move perf_event_intel_lbr.c ........ " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 07/17] perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch] Borislav Petkov
2016-02-17 12:19   ` [tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 08/17] perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c Borislav Petkov
2016-02-17 12:19   ` [tip:perf/core] perf/x86: Move perf_event_intel_rapl.c ....... " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 09/17] perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch] Borislav Petkov
2016-02-17 12:20   ` [tip:perf/core] perf/x86: Move perf_event_intel_uncore.[ch] .. " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 10/17] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Borislav Petkov
2016-02-17 12:20   ` [tip:perf/core] " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 11/17] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c Borislav Petkov
2016-02-17 12:21   ` [tip:perf/core] " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 12/17] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c Borislav Petkov
2016-02-17 12:21   ` [tip:perf/core] " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 13/17] perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c Borislav Petkov
2016-02-17 12:22   ` [tip:perf/core] perf/x86: Move perf_event_knc.c .............. " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 14/17] perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c Borislav Petkov
2016-02-17 12:22   ` [tip:perf/core] perf/x86: Move perf_event_p4.c ............... " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 15/17] perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c Borislav Petkov
2016-02-17 12:23   ` [tip:perf/core] perf/x86: Move perf_event_p6.c ............... " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 16/17] perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c Borislav Petkov
2016-02-17 12:23   ` [tip:perf/core] perf/x86: Move perf_event_msr.c .............. " tip-bot for Borislav Petkov
2016-02-10  9:55 ` [PATCH 17/17] perf/x86: Move perf_event.h to its new home Borislav Petkov
2016-02-17 12:23   ` [tip:perf/core] " tip-bot for Borislav Petkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).