summaryrefslogtreecommitdiff
path: root/arch/s390/kernel/perf_pai_ext.c
diff options
context:
space:
mode:
authorThomas Richter <tmricht@linux.ibm.com>2023-01-24 12:20:54 +0100
committerHeiko Carstens <hca@linux.ibm.com>2023-01-25 20:51:10 +0100
commit1e99c242acb2fc211aa9f57cd1060622e66bbf63 (patch)
tree1b253344572665bd88633d6932ec832d0fc72e22 /arch/s390/kernel/perf_pai_ext.c
parentea53e6995f45e857fd34e4fbfbd436b5457da5f7 (diff)
downloadlwn-1e99c242acb2fc211aa9f57cd1060622e66bbf63.tar.gz
lwn-1e99c242acb2fc211aa9f57cd1060622e66bbf63.zip
s390/cpum_cf: merge source files for CPU Measurement counter facility
With no in-kernel user, the source files can be merged. Move all functions and the variable definitions to file perf_cpum_cf.c This file now contains all the necessary functions and definitions for the CPU Measurement counter facility device driver. The files cpu_mcf.h and perf_cpum_cf_common.c are deleted. Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> Acked-by: Hendrik Brueckner <brueckner@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel/perf_pai_ext.c')
-rw-r--r--arch/s390/kernel/perf_pai_ext.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/perf_pai_ext.c b/arch/s390/kernel/perf_pai_ext.c
index 1138f57baae3..bc3e49ebf930 100644
--- a/arch/s390/kernel/perf_pai_ext.c
+++ b/arch/s390/kernel/perf_pai_ext.c
@@ -16,8 +16,8 @@
#include <linux/init.h>
#include <linux/export.h>
#include <linux/io.h>
+#include <linux/perf_event.h>
-#include <asm/cpu_mcf.h>
#include <asm/ctl_reg.h>
#include <asm/pai.h>
#include <asm/debug.h>