perf: Sanitize perf directory structure, p2
Subsystems (3)
Borislav Petkov
maintainercover perf: Sanitize perf directory structure, p2
From: Borislav Petkov <[email protected]>
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%)Signature · 1 line
2.3.5
Borislav Petkov
maintainerPATCH 1/17 perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c
From: Borislav Petkov <[email protected]>
Start moving the Intel bits.
---
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%)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/bts.c renamed from arch/x86/kernel/cpu/perf_event_intel_bts.c +1 -1
@@ -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;
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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 \
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c
perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c
Commit-ID: af5d3aabc04a4b7732b1d3404feebadfe5ae9362 Gitweb: http://git.kernel.org/tip/af5d3aabc04a4b7732b1d3404feebadfe5ae9362 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:07 +0100 Committer: Ingo Molnar <[email protected]> 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.
---
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(-)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/bts.c renamed from arch/x86/kernel/cpu/perf_event_intel_bts.c +1 -1
@@ -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;
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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 \
Borislav Petkov
maintainerPATCH 2/17 perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/core.c renamed from arch/x86/kernel/cpu/perf_event_intel.c +1 -1
@@ -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.
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.c
perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.c
Commit-ID: e1069839dd6893d2135b2fc4d96e5d03d73c2c3d Gitweb: http://git.kernel.org/tip/e1069839dd6893d2135b2fc4d96e5d03d73c2c3d Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:08 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:45 +0100
perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.c
---
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(-)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/core.c renamed from arch/x86/kernel/cpu/perf_event_intel.c +1 -1
@@ -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.
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Borislav Petkov
maintainerPATCH 3/17 perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/cqm.c renamed from arch/x86/kernel/cpu/perf_event_intel_cqm.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_cqm.c ........ => x86/events/intel/cqm.c
perf/x86: Move perf_event_intel_cqm.c ........ => x86/events/intel/cqm.c
Commit-ID: 5c781a3daa3053c355259894f9e7a478deb0cb46 Gitweb: http://git.kernel.org/tip/5c781a3daa3053c355259894f9e7a478deb0cb46 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:09 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:46 +0100
perf/x86: Move perf_event_intel_cqm.c ........ => x86/events/intel/cqm.c
---
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(-)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/cqm.c renamed from arch/x86/kernel/cpu/perf_event_intel_cqm.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Borislav Petkov
maintainerPATCH 4/17 perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/cstate.c renamed from arch/x86/kernel/cpu/perf_event_intel_cstate.c +1 -1
@@ -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, \
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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 \
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_cstate.c ..... => x86/events/intel/cstate.c
perf/x86: Move perf_event_intel_cstate.c ..... => x86/events/intel/cstate.c
Commit-ID: 6aec1ad7365661315e9ab13b17eeb97ab3c38176 Gitweb: http://git.kernel.org/tip/6aec1ad7365661315e9ab13b17eeb97ab3c38176 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:10 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:46 +0100
perf/x86: Move perf_event_intel_cstate.c ..... => x86/events/intel/cstate.c
---
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(-)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/cstate.c renamed from arch/x86/kernel/cpu/perf_event_intel_cstate.c +1 -1
@@ -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, \
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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 \
Borislav Petkov
maintainerPATCH 5/17 perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/ds.c renamed from arch/x86/kernel/cpu/perf_event_intel_ds.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_ds.c ......... => x86/events/intel/ds.c
perf/x86: Move perf_event_intel_ds.c ......... => x86/events/intel/ds.c
Commit-ID: 7010d129137aa44a79a6a1911881e07e1cd5da60 Gitweb: http://git.kernel.org/tip/7010d129137aa44a79a6a1911881e07e1cd5da60 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:11 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:46 +0100
perf/x86: Move perf_event_intel_ds.c ......... => x86/events/intel/ds.c
---
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(-)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/ds.c renamed from arch/x86/kernel/cpu/perf_event_intel_ds.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Borislav Petkov
maintainerPATCH 6/17 perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/lbr.c renamed from arch/x86/kernel/cpu/perf_event_intel_lbr.c +1 -1
@@ -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 ,
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_lbr.c ........ => x86/events/intel/lbr.c
perf/x86: Move perf_event_intel_lbr.c ........ => x86/events/intel/lbr.c
Commit-ID: c85cc4497f823b83379a23e798018d69fe566185 Gitweb: http://git.kernel.org/tip/c85cc4497f823b83379a23e798018d69fe566185 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:12 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:46 +0100
perf/x86: Move perf_event_intel_lbr.c ........ => x86/events/intel/lbr.c
---
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(-)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/lbr.c renamed from arch/x86/kernel/cpu/perf_event_intel_lbr.c +1 -1
@@ -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 ,
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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
Borislav Petkov
maintainerPATCH 7/17 perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch]
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/pt.c renamed from arch/x86/kernel/cpu/perf_event_intel_pt.c +2 -2
@@ -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);
arch/x86/events/intel/pt.h renamed from arch/x86/kernel/cpu/intel_pt.h +0 -0
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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 \
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch]
perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch]
Commit-ID: fd1c601c25785ef38d698ff0091b5fe253074715 Gitweb: http://git.kernel.org/tip/fd1c601c25785ef38d698ff0091b5fe253074715 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:13 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:47 +0100
perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch]
---
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(-)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/pt.c renamed from arch/x86/kernel/cpu/perf_event_intel_pt.c +2 -2
@@ -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);
arch/x86/events/intel/pt.h renamed from arch/x86/kernel/cpu/intel_pt.h +0 -0
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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 \
Borislav Petkov
maintainerPATCH 8/17 perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/rapl.c renamed from arch/x86/kernel/cpu/perf_event_intel_rapl.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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 \
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.c
perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.c
Commit-ID: 609d809f832ddda20f03029c865dd052596ea394 Gitweb: http://git.kernel.org/tip/609d809f832ddda20f03029c865dd052596ea394 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:14 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:47 +0100
perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.c
---
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(-)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/rapl.c renamed from arch/x86/kernel/cpu/perf_event_intel_rapl.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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 \
Borislav Petkov
maintainerPATCH 9/17 perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch]
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/uncore.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore.c +1 -1
@@ -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;
arch/x86/events/intel/uncore.h renamed from arch/x86/kernel/cpu/perf_event_intel_uncore.h +1 -1
@@ -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)
arch/x86/kernel/cpu/Makefile +1 -2
@@ -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
arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c +1 -1
@@ -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
arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +1 -1
@@ -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
arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +1 -2
@@ -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)
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_uncore.[ch] .. => x86/events/intel/uncore.[ch]
perf/x86: Move perf_event_intel_uncore.[ch] .. => x86/events/intel/uncore.[ch]
Commit-ID: 6bcb2db547be8263a98ae9413127df9385b38763 Gitweb: http://git.kernel.org/tip/6bcb2db547be8263a98ae9413127df9385b38763 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:15 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:47 +0100
perf/x86: Move perf_event_intel_uncore.[ch] .. => x86/events/intel/uncore.[ch]
---
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(-)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/uncore.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore.c +1 -1
@@ -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;
arch/x86/events/intel/uncore.h renamed from arch/x86/kernel/cpu/perf_event_intel_uncore.h +1 -1
@@ -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)
arch/x86/kernel/cpu/Makefile +1 -2
@@ -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
arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c +1 -1
@@ -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
arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +1 -1
@@ -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
arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +1 -2
@@ -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)
Borislav Petkov
maintainerPATCH 10/17 perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/uncore_nhmex.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -2
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
Commit-ID: 35bf705c25e875f40ff8ed6af415315335973977 Gitweb: http://git.kernel.org/tip/35bf705c25e875f40ff8ed6af415315335973977 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:16 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:09:48 +0100
perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c
--- 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(-)
arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/uncore_nhmex.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -2
@@ -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
Borislav Petkov
maintainerPATCH 11/17 perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/uncore_snb.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -2
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c
perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c
Commit-ID: 92553e40c6292408faa069b34a6db0dab4055080 Gitweb: http://git.kernel.org/tip/92553e40c6292408faa069b34a6db0dab4055080 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:17 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:11:26 +0100
perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c
--- 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(-)
arch/x86/events/Makefile +1 -0
@@ -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
arch/x86/events/intel/uncore_snb.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +1 -2
@@ -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
Borislav Petkov
maintainerPATCH 12/17 perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/uncore_snbep.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +1 -1
@@ -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)
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
Commit-ID: ed367e6ca42716a11a6d1b5162fdd378f9494eff Gitweb: http://git.kernel.org/tip/ed367e6ca42716a11a6d1b5162fdd378f9494eff Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:18 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:11:34 +0100
perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c
--- 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(-)
arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/uncore_snbep.c renamed from arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +1 -1
@@ -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)
arch/x86/kernel/cpu/Makefile +0 -1
@@ -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
Borislav Petkov
maintainerPATCH 13/17 perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +2 -2
@@ -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
arch/x86/events/intel/knc.c renamed from arch/x86/kernel/cpu/perf_event_knc.c +1 -1
@@ -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[] = {
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_knc.c .............. => x86/events/intel/knc.c
perf/x86: Move perf_event_knc.c .............. => x86/events/intel/knc.c
Commit-ID: edbb591870dc8d1fd855014ea5360475f7bc46af Gitweb: http://git.kernel.org/tip/edbb591870dc8d1fd855014ea5360475f7bc46af Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:19 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:11:35 +0100
perf/x86: Move perf_event_knc.c .............. => x86/events/intel/knc.c
---
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(-)arch/x86/events/Makefile +2 -2
@@ -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
arch/x86/events/intel/knc.c renamed from arch/x86/kernel/cpu/perf_event_knc.c +1 -1
@@ -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[] = {
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Borislav Petkov
maintainerPATCH 14/17 perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +2 -1
@@ -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
arch/x86/events/intel/p4.c renamed from arch/x86/kernel/cpu/perf_event_p4.c +1 -1
@@ -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/*
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_p4.c ............... => x86/events/intel/p4.c
perf/x86: Move perf_event_p4.c ............... => x86/events/intel/p4.c
Commit-ID: f03e97dbd2bb7d9436400fb6946502268ab33542 Gitweb: http://git.kernel.org/tip/f03e97dbd2bb7d9436400fb6946502268ab33542 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:20 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:11:35 +0100
perf/x86: Move perf_event_p4.c ............... => x86/events/intel/p4.c
---
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(-)arch/x86/events/Makefile +2 -1
@@ -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
arch/x86/events/intel/p4.c renamed from arch/x86/kernel/cpu/perf_event_p4.c +1 -1
@@ -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/*
arch/x86/kernel/cpu/Makefile +1 -1
@@ -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
Borislav Petkov
maintainerPATCH 15/17 perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/p6.c renamed from arch/x86/kernel/cpu/perf_event_p6.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +0 -2
@@ -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
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.c
perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.c
Commit-ID: 5e865ed44b39fa991a8fb1d7d9c0338f8fedac33 Gitweb: http://git.kernel.org/tip/5e865ed44b39fa991a8fb1d7d9c0338f8fedac33 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:21 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:11:36 +0100
perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.c
---
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(-)arch/x86/events/Makefile +1 -1
@@ -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
arch/x86/events/intel/p6.c renamed from arch/x86/kernel/cpu/perf_event_p6.c +1 -1
@@ -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
arch/x86/kernel/cpu/Makefile +0 -2
@@ -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
Borislav Petkov
maintainerPATCH 16/17 perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
---
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%)arch/x86/events/Makefile +2 -2
@@ -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
arch/x86/events/msr.c renamed from arch/x86/kernel/cpu/perf_event_msr.c +0 -0
arch/x86/kernel/cpu/Makefile +0 -6
@@ -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/
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event_msr.c .............. => x86/events/msr.c
perf/x86: Move perf_event_msr.c .............. => x86/events/msr.c
Commit-ID: 65a27a3510c82f16e673548b4c819462fabb12ae Gitweb: http://git.kernel.org/tip/65a27a3510c82f16e673548b4c819462fabb12ae Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:22 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 17 Feb 2016 10:11:36 +0100
perf/x86: Move perf_event_msr.c .............. => x86/events/msr.c
---
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(-)arch/x86/events/Makefile +2 -2
@@ -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
arch/x86/events/msr.c renamed from arch/x86/kernel/cpu/perf_event_msr.c +0 -0
arch/x86/kernel/cpu/Makefile +0 -6
@@ -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/
Borislav Petkov
maintainerPATCH 17/17 perf/x86: Move perf_event.h to its new home
In reply to Borislav PetkovFrom: Borislav Petkov <[email protected]>
Now that all functionality has been moved to arch/x86/events/, move the perf_event.h header and adjust include paths.
---
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%)arch/x86/events/amd/core.c +1 -1
@@ -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 ]
arch/x86/events/amd/ibs.c +1 -1
@@ -14,7 +14,7 @@#include <asm/apic.h> -#include "../../kernel/cpu/perf_event.h" +#include "../perf_event.h" static u32 ibs_caps;
arch/x86/events/amd/iommu.c +1 -1
@@ -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
arch/x86/events/core.c +1 -1
@@ -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 ;
arch/x86/events/intel/bts.c +1 -1
@@ -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;
arch/x86/events/intel/core.c +1 -1
@@ -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.
arch/x86/events/intel/cqm.c +1 -1
@@ -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
arch/x86/events/intel/cstate.c +1 -1
@@ -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, \
arch/x86/events/intel/ds.c +1 -1
@@ -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
arch/x86/events/intel/knc.c +1 -1
@@ -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[] = {
arch/x86/events/intel/lbr.c +1 -1
@@ -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 ,
arch/x86/events/intel/p4.c +1 -1
@@ -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/*
arch/x86/events/intel/p6.c +1 -1
@@ -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
arch/x86/events/intel/pt.c +1 -1
@@ -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);
arch/x86/events/intel/rapl.c +1 -1
@@ -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
arch/x86/events/intel/uncore.h +1 -1
@@ -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)
arch/x86/events/perf_event.h renamed from arch/x86/kernel/cpu/perf_event.h +0 -0
arch/x86/xen/pmu.c +1 -1
@@ -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 1struct xenpmu {
Signature · 1 line
2.3.5
tip-bot for Borislav Petkov
merge bot[tip:perf/core] perf/x86: Move perf_event.h to its new home
perf/x86: Move perf_event.h to its new home
Commit-ID: 27f6d22b037b2be6685e0e27cce929779d634119 Gitweb: http://git.kernel.org/tip/27f6d22b037b2be6685e0e27cce929779d634119 Author: Borislav Petkov <[email protected]> AuthorDate: Wed, 10 Feb 2016 10:55:23 +0100 Committer: Ingo Molnar <[email protected]> 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.
---
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(-)arch/x86/events/amd/core.c +1 -1
@@ -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 ]
arch/x86/events/amd/ibs.c +1 -1
@@ -14,7 +14,7 @@#include <asm/apic.h> -#include "../../kernel/cpu/perf_event.h" +#include "../perf_event.h" static u32 ibs_caps;
arch/x86/events/amd/iommu.c +1 -1
@@ -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
arch/x86/events/core.c +1 -1
@@ -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 ;
arch/x86/events/intel/bts.c +1 -1
@@ -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;
arch/x86/events/intel/core.c +1 -1
@@ -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.
arch/x86/events/intel/cqm.c +1 -1
@@ -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
arch/x86/events/intel/cstate.c +1 -1
@@ -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, \
arch/x86/events/intel/ds.c +1 -1
@@ -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
arch/x86/events/intel/knc.c +1 -1
@@ -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[] = {
arch/x86/events/intel/lbr.c +1 -1
@@ -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 ,
arch/x86/events/intel/p4.c +1 -1
@@ -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/*
arch/x86/events/intel/p6.c +1 -1
@@ -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
arch/x86/events/intel/pt.c +1 -1
@@ -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);
arch/x86/events/intel/rapl.c +1 -1
@@ -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
arch/x86/events/intel/uncore.h +1 -1
@@ -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)
arch/x86/events/perf_event.h renamed from arch/x86/kernel/cpu/perf_event.h +0 -0
arch/x86/xen/pmu.c +1 -1
@@ -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 1struct xenpmu {