Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 230ccb37 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

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: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c6eafbf9

arch/s390/include/asm/trace/diag.h

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define TRACE_INCLUDE_PATH asm/trace

#define TRACE_INCLUDE_FILE diag



TRACE_EVENT(diagnose,

TRACE_EVENT(s390_diagnose,

	TP_PROTO(unsigned short nr),

	TP_ARGS(nr),

	TP_STRUCT__entry(
@@ -32,9 +32,9 @@ TRACE_EVENT(diagnose, 
);



#ifdef CONFIG_TRACEPOINTS

void trace_diagnose_norecursion(int diag_nr);

void trace_s390_diagnose_norecursion(int diag_nr);

#else

static inline void trace_diagnose_norecursion(int diag_nr) { }

static inline void trace_s390_diagnose_norecursion(int diag_nr) { }

#endif



#endif /* _TRACE_S390_DIAG_H */

arch/s390/kernel/diag.c

+2 −2
Original line number Diff line number Diff line
@@ -121,14 +121,14 @@ device_initcall(show_diag_stat_init); 
void diag_stat_inc(enum diag_stat_enum 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);



void diag_stat_inc_norecursion(enum diag_stat_enum 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);

arch/s390/kernel/trace.c

+3 −3
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
#define CREATE_TRACE_POINTS

#include <asm/trace/diag.h>



EXPORT_TRACEPOINT_SYMBOL(diagnose);

EXPORT_TRACEPOINT_SYMBOL(s390_diagnose);



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 int *depth;
@@ -22,7 +22,7 @@ void trace_diagnose_norecursion(int diag_nr) 
	depth = this_cpu_ptr(&diagnose_trace_depth);

	if (*depth == 0) {

		(*depth)++;

		trace_diagnose(diag_nr);

		trace_s390_diagnose(diag_nr);

		(*depth)--;

	}

	local_irq_restore(flags);