[PATCH 00/17] perf: Sanitize perf directory structure, p2

Borislav Petkov
2016-02-10T10:06:43Z

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