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: Thomas Richter <tmricht@linux.ibm.com>
Acked-by: Sumanth 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: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
index 0fed84fe80d7f31b34c41ac76a4df93a9c5f8581..66200d4a21341b816147be21aae61b1ace990322 100644 (file)
--- a/arch/s390/include/asm/perf_event.h
+++ b/arch/s390/include/asm/perf_event.h
@@ -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) -  \

diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 6968be98af11790ff3f771ec5b2ca8a9a7f9c58c..18b0d025f3a273ae282e1f333dfc91be84f8d8db 100644 (file)
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -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 */