Commit 501cab2b authored by Thomas Richter's avatar Thomas Richter Committed by Vasily Gorbik
Browse files

s390/cpum_sf: Rename macro to consistent prefix 



Rename macro SAMPLE_FREQ_MODE to SAMPL_FREQ_MODE to make its
prefix consistent with all other macro starting with prefix
SAMPL_XXX.
No functional change.

Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Acked-by: default avatarSumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent ea95be4b

arch/s390/include/asm/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct perf_sf_sde_regs { 
#define SAMPL_RATE(hwc)		((hwc)->event_base)

#define SAMPL_FLAGS(hwc)	((hwc)->config_base)

#define SAMPL_DIAG_MODE(hwc)	(SAMPL_FLAGS(hwc) & PERF_CPUM_SF_DIAG_MODE)

#define SAMPLE_FREQ_MODE(hwc)	(SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE)

#define SAMPL_FREQ_MODE(hwc)	(SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE)



#define perf_arch_fetch_caller_regs(regs, __ip) do {			\

	(regs)->psw.addr = (__ip);					\

arch/s390/kernel/perf_cpum_sf.c

+2 −2
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static int __hw_perf_event_init_rate(struct perf_event *event, 
	hw_init_period(hwc, SAMPL_RATE(hwc));

	debug_sprintf_event(sfdbg, 4, "%s: cpu %d period %#llx freq %d,%#lx\n",

			    __func__, event->cpu, event->attr.sample_period,

			    event->attr.freq, SAMPLE_FREQ_MODE(hwc));

			    event->attr.freq, SAMPL_FREQ_MODE(hwc));

	return 0;

}
@@ -1865,7 +1865,7 @@ static int cpumsf_pmu_check_period(struct perf_event *event, u64 value) 
		si = cpuhw->qsi;

	}



	do_freq = !!SAMPLE_FREQ_MODE(&event->hw);

	do_freq = !!SAMPL_FREQ_MODE(&event->hw);

	rate = getrate(do_freq, value, &si);

	if (!rate)

		return -EINVAL;