diff options
| author | Hendrik Brueckner <brueckner@linux.ibm.com> | 2018-08-08 10:12:22 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2019-02-22 09:19:49 +0100 |
| commit | f944bcdf5b8431c68be8bdd13259d27412e45c14 (patch) | |
| tree | 76c83579cbc52e9aa475bd495b5130a6814b76d8 /arch/s390 | |
| parent | f1c0b83173e59c34daec48de92c0c2934e7417b2 (diff) | |
| download | linux-f944bcdf5b8431c68be8bdd13259d27412e45c14.tar.gz | |
s390/cpu_mf: move struct cpu_cf_events and per-CPU variable to header file
Make the struct cpu_cf_events and the respective per-CPU variable available to in-kernel users. Access to this per-CPU variable shall be done between the calls to __kernel_cpumcf_begin() and __kernel_cpumcf_end(). Signed-off-by: Hendrik Brueckner <brueckner@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/cpu_mcf.h | 9 | ||||
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf.c | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/arch/s390/include/asm/cpu_mcf.h b/arch/s390/include/asm/cpu_mcf.h index 63fa74115cba..82e0b80f2c81 100644 --- a/arch/s390/include/asm/cpu_mcf.h +++ b/arch/s390/include/asm/cpu_mcf.h @@ -49,6 +49,15 @@ static inline void ctr_set_stop(u64 *state, int ctr_set) *state &= ~(cpumf_ctr_ctl[ctr_set] << CPUMF_LCCTL_ACTCTL_SHIFT); } +struct cpu_cf_events { + struct cpumf_ctr_info info; + atomic_t ctr_set[CPUMF_CTR_SET_MAX]; + u64 state, tx_state; + unsigned int flags; + unsigned int txn_flags; +}; +DECLARE_PER_CPU(struct cpu_cf_events, cpu_cf_events); + int __kernel_cpumcf_begin(void); void __kernel_cpumcf_end(void); diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c index bae59455b86d..758cbb1b84f5 100644 --- a/arch/s390/kernel/perf_cpum_cf.c +++ b/arch/s390/kernel/perf_cpum_cf.c @@ -18,15 +18,8 @@ #include <asm/irq.h> #include <asm/cpu_mcf.h> -/* Local CPUMF event structure */ -struct cpu_cf_events { - struct cpumf_ctr_info info; - atomic_t ctr_set[CPUMF_CTR_SET_MAX]; - u64 state, tx_state; - unsigned int flags; - unsigned int txn_flags; -}; -static DEFINE_PER_CPU(struct cpu_cf_events, cpu_cf_events) = { +/* Per-CPU event structure for the counter facility */ +DEFINE_PER_CPU(struct cpu_cf_events, cpu_cf_events) = { .ctr_set = { [CPUMF_CTR_SET_BASIC] = ATOMIC_INIT(0), [CPUMF_CTR_SET_USER] = ATOMIC_INIT(0), |