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

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



Some defines in common header file arch/s390/include/asm/perf_event.h
are only used in one source file arch/s390/kernel/perf_cpum_sf.c.
Move these defines from header to source file.
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 501cab2b

arch/s390/include/asm/perf_event.h

+0 −16
Original line number Diff line number Diff line
@@ -50,23 +50,7 @@ struct perf_sf_sde_regs { 


/* Perf PMU definitions for the counter facility */

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



/* Perf PMU definitions for the sampling facility */

#define PERF_CPUM_SF_MAX_CTR		2

#define PERF_EVENT_CPUM_SF		0xB0000UL /* Event: Basic-sampling */

#define PERF_EVENT_CPUM_SF_DIAG		0xBD000UL /* Event: Combined-sampling */

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

#define PERF_CPUM_SF_BASIC_MODE		0x0001	  /* Basic-sampling flag */

#define PERF_CPUM_SF_DIAG_MODE		0x0002	  /* Diagnostic-sampling flag */

#define PERF_CPUM_SF_FREQ_MODE		0x0008	  /* Sampling with frequency */



#define OVERFLOW_REG(hwc)	((hwc)->extra_reg.config)

#define SFB_ALLOC_REG(hwc)	((hwc)->extra_reg.alloc)

#define TEAR_REG(hwc)		((hwc)->last_tag)

#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 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

+16 −0
Original line number Diff line number Diff line
@@ -24,6 +24,22 @@ 
#include <asm/timex.h>

#include <linux/io.h>



/* Perf PMU definitions for the sampling facility */

#define PERF_CPUM_SF_MAX_CTR		2

#define PERF_EVENT_CPUM_SF		0xB0000UL /* Event: Basic-sampling */

#define PERF_EVENT_CPUM_SF_DIAG		0xBD000UL /* Event: Combined-sampling */

#define PERF_CPUM_SF_BASIC_MODE		0x0001	  /* Basic-sampling flag */

#define PERF_CPUM_SF_DIAG_MODE		0x0002	  /* Diagnostic-sampling flag */

#define PERF_CPUM_SF_FREQ_MODE		0x0008	  /* Sampling with frequency */



#define OVERFLOW_REG(hwc)	((hwc)->extra_reg.config)

#define SFB_ALLOC_REG(hwc)	((hwc)->extra_reg.alloc)

#define TEAR_REG(hwc)		((hwc)->last_tag)

#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 SAMPL_FREQ_MODE(hwc)	(SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FREQ_MODE)



/* Minimum number of sample-data-block-tables:

 * At least one table is required for the sampling buffer structure.

 * A single table contains up to 511 pointers to sample-data-blocks.