x86/events: Remove last remnants of old filenames
Subsystems (2)
Borislav Petkov
maintainerPATCH 1/1 x86/events: Remove last remnants of old filenames
From: Borislav Petkov <[email protected]>
Update to the new file paths, remove them from introductory comments.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/events/amd/core.c | 2 +- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/rapl.c | 2 +- arch/x86/events/intel/uncore.h | 6 +++--- tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/events/amd/core.c +1 -1
@@ -604,7 +604,7 @@ amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, int idx,return &amd_f15_PMC20; }case AMD_EVENT_NB : -/* moved to perf_event_amd_uncore.c */ +/* moved to uncore.c */ return &emptyconstraint;default :return &emptyconstraint;
arch/x86/events/intel/cstate.c +1 -1
@@ -1,5 +1,5 @@/* -* perf_event_intel_cstate.c: support cstate residency counters +* Support cstate residency counters * * Copyright (C) 2015, Intel Corp. * Author: Kan Liang ([email protected])
arch/x86/events/intel/rapl.c +1 -1
@@ -1,5 +1,5 @@/* -* perf_event_intel_rapl.c: support Intel RAPL energy consumption counters +* Support Intel RAPL energy consumption counters * Copyright (C) 2013 Google, Inc., Stephane Eranian * * Intel RAPL interface is specified in the IA-32 Manual Vol3b
arch/x86/events/intel/uncore.h +3 -3
@@ -360,7 +360,7 @@ extern struct list_head pci2phy_map_head;extern struct pci_extra_dev *uncore_extra_pci_dev;extern struct event_constraint uncore_constraint_empty; -/* perf_event_intel_uncore_snb.c */ +/* uncore_snb.c */ int snb_uncore_pci_init (void );int ivb_uncore_pci_init (void );int hsw_uncore_pci_init (void );
@@ -371,7 +371,7 @@ void nhm_uncore_cpu_init(void);void skl_uncore_cpu_init (void );int snb_pci2phy_map_init (int devid); -/* perf_event_intel_uncore_snbep.c */ +/* uncore_snbep.c */ int snbep_uncore_pci_init (void );void snbep_uncore_cpu_init (void );int ivbep_uncore_pci_init (void );
@@ -385,5 +385,5 @@ void knl_uncore_cpu_init(void);int skx_uncore_pci_init (void );void skx_uncore_cpu_init (void ); -/* perf_event_intel_uncore_nhmex.c */ +/* uncore_nhmex.c */ void nhmex_uncore_cpu_init (void );
tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c +1 -1
@@ -31,7 +31,7 @@#error Instruction buffer size too small#endif -/* Based on branch_type() from perf_event_intel_lbr.c */ +/* Based on branch_type() from arch/x86/events/intel/lbr.c */ static void intel_pt_insn_decoder (struct insn *insn,struct intel_pt_insn *intel_pt_insn) {
Signature · 1 line
2.11.0
tip-bot for Borislav Petkov
merge botx86/events: Remove last remnants of old filenames
Commit-ID: 940b2f2fd963c043418ce8af64605783b2b19140 Gitweb: http://git.kernel.org/tip/940b2f2fd963c043418ce8af64605783b2b19140 Author: Borislav Petkov <[email protected]> AuthorDate: Sat, 18 Feb 2017 12:31:40 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 1 Mar 2017 11:27:26 +0100
x86/events: Remove last remnants of old filenames
Update to the new file paths, remove them from introductory comments.
Signed-off-by Borislav Petkov <[email protected]>
Cc Peter Zijlstra <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- arch/x86/events/amd/core.c | 2 +- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/rapl.c | 2 +- arch/x86/events/intel/uncore.h | 6 +++--- tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/events/amd/core.c +1 -1
@@ -604,7 +604,7 @@ amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, int idx,return &amd_f15_PMC20; }case AMD_EVENT_NB : -/* moved to perf_event_amd_uncore.c */ +/* moved to uncore.c */ return &emptyconstraint;default :return &emptyconstraint;
arch/x86/events/intel/cstate.c +1 -1
@@ -1,5 +1,5 @@/* -* perf_event_intel_cstate.c: support cstate residency counters +* Support cstate residency counters * * Copyright (C) 2015, Intel Corp. * Author: Kan Liang ([email protected])
arch/x86/events/intel/rapl.c +1 -1
@@ -1,5 +1,5 @@/* -* perf_event_intel_rapl.c: support Intel RAPL energy consumption counters +* Support Intel RAPL energy consumption counters * Copyright (C) 2013 Google, Inc., Stephane Eranian * * Intel RAPL interface is specified in the IA-32 Manual Vol3b
arch/x86/events/intel/uncore.h +3 -3
@@ -360,7 +360,7 @@ extern struct list_head pci2phy_map_head;extern struct pci_extra_dev *uncore_extra_pci_dev;extern struct event_constraint uncore_constraint_empty; -/* perf_event_intel_uncore_snb.c */ +/* uncore_snb.c */ int snb_uncore_pci_init (void );int ivb_uncore_pci_init (void );int hsw_uncore_pci_init (void );
@@ -371,7 +371,7 @@ void nhm_uncore_cpu_init(void);void skl_uncore_cpu_init (void );int snb_pci2phy_map_init (int devid); -/* perf_event_intel_uncore_snbep.c */ +/* uncore_snbep.c */ int snbep_uncore_pci_init (void );void snbep_uncore_cpu_init (void );int ivbep_uncore_pci_init (void );
@@ -385,5 +385,5 @@ void knl_uncore_cpu_init(void);int skx_uncore_pci_init (void );void skx_uncore_cpu_init (void ); -/* perf_event_intel_uncore_nhmex.c */ +/* uncore_nhmex.c */ void nhmex_uncore_cpu_init (void );
tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c +1 -1
@@ -31,7 +31,7 @@#error Instruction buffer size too small#endif -/* Based on branch_type() from perf_event_intel_lbr.c */ +/* Based on branch_type() from arch/x86/events/intel/lbr.c */ static void intel_pt_insn_decoder (struct insn *insn,struct intel_pt_insn *intel_pt_insn) {