mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 00:48:50 +00:00
77cb2fea1e
The tracing infrastructure is adding a macro TRACE_SYSTEM_STRING, and
hit the following build failure:
In file included from include/trace/define_trace.h:90:0,
from drivers/gpu/drm/.//radeon/radeon_trace.h:209,
from drivers/gpu/drm/.//radeon/radeon_trace_points.c:9:
>> include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined
#define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
Seems that the DRM folks have added their own use to the
TRACE_SYSTEM_STRING, with:
#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
Although, I can not find its use anywhere. I could simply use another
name, but if this macro is not being used, it should be removed.
Link: http://lkml.kernel.org/r/20150402123736.01eda052@gandalf.local.home
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Tested-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
65 lines
1.6 KiB
C
65 lines
1.6 KiB
C
#if !defined(_DRM_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _DRM_TRACE_H_
|
|
|
|
#include <linux/stringify.h>
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM drm
|
|
#define TRACE_INCLUDE_FILE drm_trace
|
|
|
|
TRACE_EVENT(drm_vblank_event,
|
|
TP_PROTO(int crtc, unsigned int seq),
|
|
TP_ARGS(crtc, seq),
|
|
TP_STRUCT__entry(
|
|
__field(int, crtc)
|
|
__field(unsigned int, seq)
|
|
),
|
|
TP_fast_assign(
|
|
__entry->crtc = crtc;
|
|
__entry->seq = seq;
|
|
),
|
|
TP_printk("crtc=%d, seq=%u", __entry->crtc, __entry->seq)
|
|
);
|
|
|
|
TRACE_EVENT(drm_vblank_event_queued,
|
|
TP_PROTO(pid_t pid, int crtc, unsigned int seq),
|
|
TP_ARGS(pid, crtc, seq),
|
|
TP_STRUCT__entry(
|
|
__field(pid_t, pid)
|
|
__field(int, crtc)
|
|
__field(unsigned int, seq)
|
|
),
|
|
TP_fast_assign(
|
|
__entry->pid = pid;
|
|
__entry->crtc = crtc;
|
|
__entry->seq = seq;
|
|
),
|
|
TP_printk("pid=%d, crtc=%d, seq=%u", __entry->pid, __entry->crtc, \
|
|
__entry->seq)
|
|
);
|
|
|
|
TRACE_EVENT(drm_vblank_event_delivered,
|
|
TP_PROTO(pid_t pid, int crtc, unsigned int seq),
|
|
TP_ARGS(pid, crtc, seq),
|
|
TP_STRUCT__entry(
|
|
__field(pid_t, pid)
|
|
__field(int, crtc)
|
|
__field(unsigned int, seq)
|
|
),
|
|
TP_fast_assign(
|
|
__entry->pid = pid;
|
|
__entry->crtc = crtc;
|
|
__entry->seq = seq;
|
|
),
|
|
TP_printk("pid=%d, crtc=%d, seq=%u", __entry->pid, __entry->crtc, \
|
|
__entry->seq)
|
|
);
|
|
|
|
#endif /* _DRM_TRACE_H_ */
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#include <trace/define_trace.h>
|