Commit b1d45c23 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Steven Rostedt (VMware)
Browse files

tracing: Fix header include guards in trace event headers 

These include guards are broken.

Match the #if !define() and #define lines so that they work correctly.

Link: http://lkml.kernel.org/r/20190720103943.16982-1-yamada.masahiro@socionext.com



Fixes: f54d1867 ("dma-buf: Rename struct fence to dma_fence")
Fixes: 2e26ca71 ("tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header")
Fixes: e543002f ("qdisc: add tracepoint qdisc:qdisc_dequeue for dequeued SKBs")
Fixes: 95f295f9 ("dmaengine: tegra: add tracepoints to driver")
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 609488bc

include/trace/events/dma_fence.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM dma_fence



#if !defined(_TRACE_FENCE_H) || defined(TRACE_HEADER_MULTI_READ)

#if !defined(_TRACE_DMA_FENCE_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_DMA_FENCE_H



#include <linux/tracepoint.h>

include/trace/events/napi.h

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define TRACE_SYSTEM napi



#if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_NAPI_H_

#define _TRACE_NAPI_H



#include <linux/netdevice.h>

#include <linux/tracepoint.h>
@@ -38,7 +38,7 @@ TRACE_EVENT(napi_poll, 


#undef NO_DEV



#endif /* _TRACE_NAPI_H_ */

#endif /* _TRACE_NAPI_H */



/* This part must be outside protection */

#include <trace/define_trace.h>

include/trace/events/qdisc.h

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define TRACE_SYSTEM qdisc



#if !defined(_TRACE_QDISC_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_QDISC_H_

#define _TRACE_QDISC_H



#include <linux/skbuff.h>

#include <linux/netdevice.h>
@@ -44,7 +44,7 @@ TRACE_EVENT(qdisc_dequeue, 
		  __entry->txq_state, __entry->packets, __entry->skbaddr )

);



#endif /* _TRACE_QDISC_H_ */

#endif /* _TRACE_QDISC_H */



/* This part must be outside protection */

#include <trace/define_trace.h>

include/trace/events/tegra_apb_dma.h

+2 −2
Original line number Diff line number Diff line 
#if !defined(_TRACE_TEGRA_APB_DMA_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_TEGRA_APM_DMA_H

#define _TRACE_TEGRA_APB_DMA_H



#include <linux/tracepoint.h>

#include <linux/dmaengine.h>
@@ -55,7 +55,7 @@ TRACE_EVENT(tegra_dma_isr, 
	TP_printk("%s: irq %d\n",  __get_str(chan), __entry->irq)

);



#endif /*  _TRACE_TEGRADMA_H */

#endif /* _TRACE_TEGRA_APB_DMA_H */



/* This part must be outside protection */

#include <trace/define_trace.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE