aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2015-11-05 07:50:04 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-11-09 03:10:47 -0500
commit230ccb370f8f95b2600a1fce90ceb8ee70a15dbc (patch)
tree9dbc360ce6244d196492ec5db33d4bdca3e347b5
parentc6eafbf9903c4283ba146098ad54240a24ffbeb1 (diff)
s390/diag: add a s390 prefix to the diagnose trace point
Documentation/trace/tracepoints.txt states that the naming scheme for tracepoints is "subsys_event" to avoid collisions. Rename the 'diagnose' tracepoint to 's390_diagnose'. Reported-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/trace/diag.h6
-rw-r--r--arch/s390/kernel/diag.c4
-rw-r--r--arch/s390/kernel/trace.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/s390/include/asm/trace/diag.h b/arch/s390/include/asm/trace/diag.h
index 776f307960cc..cc6cfe7889da 100644
--- a/arch/s390/include/asm/trace/diag.h
+++ b/arch/s390/include/asm/trace/diag.h
@@ -19,7 +19,7 @@
19#define TRACE_INCLUDE_PATH asm/trace 19#define TRACE_INCLUDE_PATH asm/trace
20#define TRACE_INCLUDE_FILE diag 20#define TRACE_INCLUDE_FILE diag
21 21
22TRACE_EVENT(diagnose, 22TRACE_EVENT(s390_diagnose,
23 TP_PROTO(unsigned short nr), 23 TP_PROTO(unsigned short nr),
24 TP_ARGS(nr), 24 TP_ARGS(nr),
25 TP_STRUCT__entry( 25 TP_STRUCT__entry(
@@ -32,9 +32,9 @@ TRACE_EVENT(diagnose,
32); 32);
33 33
34#ifdef CONFIG_TRACEPOINTS 34#ifdef CONFIG_TRACEPOINTS
35void trace_diagnose_norecursion(int diag_nr); 35void trace_s390_diagnose_norecursion(int diag_nr);
36#else 36#else
37static inline void trace_diagnose_norecursion(int diag_nr) { } 37static inline void trace_s390_diagnose_norecursion(int diag_nr) { }
38#endif 38#endif
39 39
40#endif /* _TRACE_S390_DIAG_H */ 40#endif /* _TRACE_S390_DIAG_H */
diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c
index f98766ede4e1..48b37b8357e6 100644
--- a/arch/s390/kernel/diag.c
+++ b/arch/s390/kernel/diag.c
@@ -121,14 +121,14 @@ device_initcall(show_diag_stat_init);
121void diag_stat_inc(enum diag_stat_enum nr) 121void diag_stat_inc(enum diag_stat_enum nr)
122{ 122{
123 this_cpu_inc(diag_stat.counter[nr]); 123 this_cpu_inc(diag_stat.counter[nr]);
124 trace_diagnose(diag_map[nr].code); 124 trace_s390_diagnose(diag_map[nr].code);
125} 125}
126EXPORT_SYMBOL(diag_stat_inc); 126EXPORT_SYMBOL(diag_stat_inc);
127 127
128void diag_stat_inc_norecursion(enum diag_stat_enum nr) 128void diag_stat_inc_norecursion(enum diag_stat_enum nr)
129{ 129{
130 this_cpu_inc(diag_stat.counter[nr]); 130 this_cpu_inc(diag_stat.counter[nr]);
131 trace_diagnose_norecursion(diag_map[nr].code); 131 trace_s390_diagnose_norecursion(diag_map[nr].code);
132} 132}
133EXPORT_SYMBOL(diag_stat_inc_norecursion); 133EXPORT_SYMBOL(diag_stat_inc_norecursion);
134 134
diff --git a/arch/s390/kernel/trace.c b/arch/s390/kernel/trace.c
index 73239bb576c4..21a5df99552b 100644
--- a/arch/s390/kernel/trace.c
+++ b/arch/s390/kernel/trace.c
@@ -9,11 +9,11 @@
9#define CREATE_TRACE_POINTS 9#define CREATE_TRACE_POINTS
10#include <asm/trace/diag.h> 10#include <asm/trace/diag.h>
11 11
12EXPORT_TRACEPOINT_SYMBOL(diagnose); 12EXPORT_TRACEPOINT_SYMBOL(s390_diagnose);
13 13
14static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth); 14static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth);
15 15
16void trace_diagnose_norecursion(int diag_nr) 16void trace_s390_diagnose_norecursion(int diag_nr)
17{ 17{
18 unsigned long flags; 18 unsigned long flags;
19 unsigned int *depth; 19 unsigned int *depth;
@@ -22,7 +22,7 @@ void trace_diagnose_norecursion(int diag_nr)
22 depth = this_cpu_ptr(&diagnose_trace_depth); 22 depth = this_cpu_ptr(&diagnose_trace_depth);
23 if (*depth == 0) { 23 if (*depth == 0) {
24 (*depth)++; 24 (*depth)++;
25 trace_diagnose(diag_nr); 25 trace_s390_diagnose(diag_nr);
26 (*depth)--; 26 (*depth)--;
27 } 27 }
28 local_irq_restore(flags); 28 local_irq_restore(flags);