arch:x86:kernel:cpu Modified some lines according to coding style
Subsystems (2)
PATCH 1/2 arch:x86:kernel:cpu Modified some lines according to coding style
Only some code modifications according to the coding style guide
Signed-off-by Jose Manuel Abuin Mosquera <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_rapl.c +4 -3
@@ -116,7 +116,7 @@ static struct perf_pmu_events_attr event_attr_##v = { \ .attr = __ATTR(_name, 0444, rapl_sysfs_show, NULL), \ .id = 0, \ .event_str = str, \ -}; +}struct rapl_pmu {spinlock_t lock;
@@ -139,6 +139,7 @@ static struct x86_pmu_quirk *rapl_quirks;static inline u64 rapl_read_counter (struct perf_event *event) {u64 raw; +rdmsrl (event->hw.event_base, raw);return raw; }
@@ -204,8 +205,8 @@ again:static void rapl_start_hrtimer (struct rapl_pmu *pmu) { -hrtimer_start (&pmu->hrtimer, pmu->timer_interval, -HRTIMER_MODE_REL_PINNED ); +hrtimer_start (&pmu->hrtimer, pmu->timer_interval, +HRTIMER_MODE_REL_PINNED ); }static void rapl_stop_hrtimer (struct rapl_pmu *pmu)
Signature · 1 line
2.4.6
PATCH 2/2 arch:x86:kernel:cpu Changed some spaces into tabs and printk KERN_CONT into pr_cont
Some lines with spaces indentations are changed into tabs.
Calls to printk(KERN_CONT are changed into pr_cont(
Signed-off-by Jose Manuel Abuin Mosquera <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel_ds.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_ds.c +12 -10
@@ -630,18 +630,18 @@ struct event_constraint intel_snb_pebs_event_constraints[] = {INTEL_PST_CONSTRAINT (0x02cd ,0x8 ),/* MEM_TRANS_RETIRED.PRECISE_STORES */ /* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */ INTEL_FLAGS_EVENT_CONSTRAINT (0x108001c2 ,0xf ), -INTEL_EXCLEVT_CONSTRAINT (0xd0 ,0xf ),/* MEM_UOP_RETIRED.* */ -INTEL_EXCLEVT_CONSTRAINT (0xd1 ,0xf ),/* MEM_LOAD_UOPS_RETIRED.* */ -INTEL_EXCLEVT_CONSTRAINT (0xd2 ,0xf ),/* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */ -INTEL_EXCLEVT_CONSTRAINT (0xd3 ,0xf ),/* MEM_LOAD_UOPS_LLC_MISS_RETIRED.* */ +INTEL_EXCLEVT_CONSTRAINT (0xd0 ,0xf ),/* MEM_UOP_RETIRED.* */ +INTEL_EXCLEVT_CONSTRAINT (0xd1 ,0xf ),/* MEM_LOAD_UOPS_RETIRED.* */ +INTEL_EXCLEVT_CONSTRAINT (0xd2 ,0xf ),/* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */ +INTEL_EXCLEVT_CONSTRAINT (0xd3 ,0xf ),/* MEM_LOAD_UOPS_LLC_MISS_RETIRED.* */ /* Allow all events as PEBS with no flags */ INTEL_ALL_EVENT_CONSTRAINT (0 ,0xf ),EVENT_CONSTRAINT_END };struct event_constraint intel_ivb_pebs_event_constraints[] = { -INTEL_FLAGS_UEVENT_CONSTRAINT (0x01c0 ,0x2 ),/* INST_RETIRED.PRECDIST */ -INTEL_PLD_CONSTRAINT (0x01cd ,0x8 ),/* MEM_TRANS_RETIRED.LAT_ABOVE_THR */ +INTEL_FLAGS_UEVENT_CONSTRAINT (0x01c0 ,0x2 ),/* INST_RETIRED.PRECDIST */ +INTEL_PLD_CONSTRAINT (0x01cd ,0x8 ),/* MEM_TRANS_RETIRED.LAT_ABOVE_THR */ INTEL_PST_CONSTRAINT (0x02cd ,0x8 ),/* MEM_TRANS_RETIRED.PRECISE_STORES */ /* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */ INTEL_FLAGS_EVENT_CONSTRAINT(0x108001c2, 0xf),
@@ -651,7 +651,7 @@ struct event_constraint intel_ivb_pebs_event_constraints[] = {INTEL_EXCLEVT_CONSTRAINT (0xd3 ,0xf ),/* MEM_LOAD_UOPS_LLC_MISS_RETIRED.* */ /* Allow all events as PEBS with no flags */ INTEL_ALL_EVENT_CONSTRAINT (0 ,0xf ), -EVENT_CONSTRAINT_END +EVENT_CONSTRAINT_END }; struct event_constraint intel_hsw_pebs_event_constraints[] = {
@@ -889,6 +889,7 @@ static inline u64 intel_hsw_weight(struct pebs_record_hsw *pebs) {if (pebs->tsx_tuning) {union hsw_tsx_tuning tsx = { .value = pebs->tsx_tuning }; +return tsx.cycles_last_block; }return 0 ;
@@ -947,6 +948,7 @@ static void setup_pebs_sample_data(struct perf_event *event,*/ if (dsrc) {u64 val =PERF_MEM_NA ; +if (fll) val =load_latency_data (pebs->dse);else if (fst && (fl &PERF_X86_EVENT_PEBS_HSW_PREC ))
@@ -1228,13 +1230,13 @@ void __init intel_ds_init(void)switch (format) {case 0 : -printk (KERN_CONT "PEBS fmt0%c, " , pebs_type); +pr_cont ("PEBS fmt0%c, " , pebs_type); x86_pmu.pebs_record_size =sizeof (struct pebs_record_core ); x86_pmu.drain_pebs = intel_pmu_drain_pebs_core;break ;case 1 : -printk (KERN_CONT "PEBS fmt1%c, " , pebs_type); +pr_cont ("PEBS fmt1%c, " , pebs_type); x86_pmu.pebs_record_size =sizeof (struct pebs_record_nhm ); x86_pmu.drain_pebs = intel_pmu_drain_pebs_nhm;break ;
@@ -1246,7 +1248,7 @@ void __init intel_ds_init(void)break ;default : -printk (KERN_CONT "no PEBS fmt%d%c, " , format, pebs_type); +pr_cont ("no PEBS fmt%d%c, " , format, pebs_type); x86_pmu.pebs =0 ; } }
Signature · 1 line
2.4.6