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

s390/cpum_cf: Move defines from header file to source file 



The macros PERF_CPUM_CF_MAX_CTR and PERF_EVENT_CPUM_CF_DIAG
are used in only one source file arch/s390/kernel/perf_cpum_cf.c.
Move these defines from the header file
arch/s390/include/asm/perf_event.h to the only user.
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 52d6ef92

arch/s390/include/asm/perf_event.h

+0 −4
Original line number Diff line number Diff line
@@ -48,10 +48,6 @@ struct perf_sf_sde_regs { 
	unsigned long reserved:63;	  /* reserved */

};



/* Perf PMU definitions for the counter facility */

#define PERF_CPUM_CF_MAX_CTR		0xffffUL  /* Max ctr for ECCTR */

#define PERF_EVENT_CPUM_CF_DIAG		0xBC000UL /* Event: Counter sets */



#define perf_arch_fetch_caller_regs(regs, __ip) do {			\

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

	(regs)->gprs[15] = (unsigned long)__builtin_frame_address(0) -	\

arch/s390/kernel/perf_cpum_cf.c

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ 
#include <asm/hwctrset.h>

#include <asm/debug.h>



/* Perf PMU definitions for the counter facility */

#define PERF_CPUM_CF_MAX_CTR		0xffffUL  /* Max ctr for ECCTR */

#define PERF_EVENT_CPUM_CF_DIAG		0xBC000UL /* Event: Counter sets */



enum cpumf_ctr_set {

	CPUMF_CTR_SET_BASIC   = 0,    /* Basic Counter Set */

	CPUMF_CTR_SET_USER    = 1,    /* Problem-State Counter Set */