leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/diag: add a s390 prefix to the diagnose trace point

Browse Source 
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>
This commit is contained in:
Martin Schwidefsky 2015-11-05 13:50:04 +01:00
parent c6eafbf990
commit 230ccb370f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/s390/include/asm/trace/diag.h
View File

@ -19,7 +19,7 @@
#define TRACE_INCLUDE_PATH asm/trace #define TRACE_INCLUDE_PATH asm/trace
#define TRACE_INCLUDE_FILE diag #define TRACE_INCLUDE_FILE diag
TRACE_EVENT(diagnose, TRACE_EVENT(s390_diagnose,
TP_PROTO(unsigned short nr), TP_PROTO(unsigned short nr),
TP_ARGS(nr), TP_ARGS(nr),
TP_STRUCT__entry( TP_STRUCT__entry(
@ -32,9 +32,9 @@ TRACE_EVENT(diagnose,
); );
#ifdef CONFIG_TRACEPOINTS #ifdef CONFIG_TRACEPOINTS
void trace_diagnose_norecursion(int diag_nr); void trace_s390_diagnose_norecursion(int diag_nr);
#else #else
static inline void trace_diagnose_norecursion(int diag_nr) { } static inline void trace_s390_diagnose_norecursion(int diag_nr) { }
#endif #endif
#endif /* _TRACE_S390_DIAG_H */ #endif /* _TRACE_S390_DIAG_H */

4
arch/s390/kernel/diag.c
View File

@ -121,14 +121,14 @@ device_initcall(show_diag_stat_init);
void diag_stat_inc(enum diag_stat_enum nr) void diag_stat_inc(enum diag_stat_enum nr)
{ {
this_cpu_inc(diag_stat.counter[nr]); this_cpu_inc(diag_stat.counter[nr]);
trace_diagnose(diag_map[nr].code); trace_s390_diagnose(diag_map[nr].code);
} }
EXPORT_SYMBOL(diag_stat_inc); EXPORT_SYMBOL(diag_stat_inc);
void diag_stat_inc_norecursion(enum diag_stat_enum nr) void diag_stat_inc_norecursion(enum diag_stat_enum nr)
{ {
this_cpu_inc(diag_stat.counter[nr]); this_cpu_inc(diag_stat.counter[nr]);
trace_diagnose_norecursion(diag_map[nr].code); trace_s390_diagnose_norecursion(diag_map[nr].code);
} }
EXPORT_SYMBOL(diag_stat_inc_norecursion); EXPORT_SYMBOL(diag_stat_inc_norecursion);

6
arch/s390/kernel/trace.c
View File

@ -9,11 +9,11 @@
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <asm/trace/diag.h> #include <asm/trace/diag.h>
EXPORT_TRACEPOINT_SYMBOL(diagnose); EXPORT_TRACEPOINT_SYMBOL(s390_diagnose);
static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth); static DEFINE_PER_CPU(unsigned int, diagnose_trace_depth);
void trace_diagnose_norecursion(int diag_nr) void trace_s390_diagnose_norecursion(int diag_nr)
{ {
unsigned long flags; unsigned long flags;
unsigned int *depth; unsigned int *depth;
@ -22,7 +22,7 @@ void trace_diagnose_norecursion(int diag_nr)
depth = this_cpu_ptr(&diagnose_trace_depth); depth = this_cpu_ptr(&diagnose_trace_depth);
if (*depth == 0) { if (*depth == 0) {
(*depth)++; (*depth)++;
trace_diagnose(diag_nr); trace_s390_diagnose(diag_nr);
(*depth)--; (*depth)--;
} }
local_irq_restore(flags); local_irq_restore(flags);