Commit 5dddfaac authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/cpum_cf: move array from header to C file 



Move array from header to C file to avoid that it gets defined in
every C file where the header is included:

In file included from arch/s390/kernel/perf_cpum_cf_common.c:19:
./arch/s390/include/asm/cpu_mcf.h:27:18: warning: ‘cpumf_ctr_ctl’ defined but not used [-Wunused-const-variable=]
   27 | static const u64 cpumf_ctr_ctl[CPUMF_CTR_SET_MAX] = {
      |                  ^~~~~~~~~~~~~

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 2e827528

arch/s390/include/asm/cpu_mcf.h

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ enum cpumf_ctr_set { 


#define CPUMF_LCCTL_ENABLE_SHIFT    16

#define CPUMF_LCCTL_ACTCTL_SHIFT     0

static const u64 cpumf_ctr_ctl[CPUMF_CTR_SET_MAX] = {

	[CPUMF_CTR_SET_BASIC]	= 0x02,

	[CPUMF_CTR_SET_USER]	= 0x04,

	[CPUMF_CTR_SET_CRYPTO]	= 0x08,

	[CPUMF_CTR_SET_EXT]	= 0x01,

	[CPUMF_CTR_SET_MT_DIAG] = 0x20,

};



static inline void ctr_set_enable(u64 *state, u64 ctrsets)

{

arch/s390/kernel/perf_cpum_cf.c

+8 −0
Original line number Diff line number Diff line
@@ -158,6 +158,14 @@ static size_t cfdiag_getctrset(struct cf_ctrset_entry *ctrdata, int ctrset, 
	return need;

}



static const u64 cpumf_ctr_ctl[CPUMF_CTR_SET_MAX] = {

	[CPUMF_CTR_SET_BASIC]	= 0x02,

	[CPUMF_CTR_SET_USER]	= 0x04,

	[CPUMF_CTR_SET_CRYPTO]	= 0x08,

	[CPUMF_CTR_SET_EXT]	= 0x01,

	[CPUMF_CTR_SET_MT_DIAG] = 0x20,

};



/* Read out all counter sets and save them in the provided data buffer.

 * The last 64 byte host an artificial trailer entry.

 */