(2015/04/03 10:38), Steven Rostedt wrote:
> From: Steven Rostedt <[email protected]>
>
> 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/[email protected]
>
> Cc: Alex Deucher <[email protected]>
> Cc: Christian König <[email protected]>
> Cc: David Airlie <[email protected]>
> Cc: Daniel Vetter <[email protected]>
> Cc: Jani Nikula <[email protected]>
> Reported-by: kbuild test robot <[email protected]>
> Signed-off-by: Steven Rostedt <[email protected]>
Reviewed-by: Masami Hiramatsu <[email protected]>
Thanks,
> ---
> drivers/gpu/drm/drm_trace.h | 1 -
> drivers/gpu/drm/i915/i915_trace.h | 1 -
> drivers/gpu/drm/radeon/radeon_trace.h | 1 -
> 3 files changed, 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_trace.h b/drivers/gpu/drm/drm_trace.h
> index 27cc95f36381..ce3c42813fbb 100644
> --- a/drivers/gpu/drm/drm_trace.h
> +++ b/drivers/gpu/drm/drm_trace.h
> @@ -7,7 +7,6 @@
>
> #undef TRACE_SYSTEM
> #define TRACE_SYSTEM drm
> -#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
> #define TRACE_INCLUDE_FILE drm_trace
>
> TRACE_EVENT(drm_vblank_event,
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index 6058a01b4443..d776621c8521 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -12,7 +12,6 @@
>
> #undef TRACE_SYSTEM
> #define TRACE_SYSTEM i915
> -#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
> #define TRACE_INCLUDE_FILE i915_trace
>
> /* pipe updates */
> diff --git a/drivers/gpu/drm/radeon/radeon_trace.h b/drivers/gpu/drm/radeon/radeon_trace.h
> index ce075cb08cb2..fdce4062901f 100644
> --- a/drivers/gpu/drm/radeon/radeon_trace.h
> +++ b/drivers/gpu/drm/radeon/radeon_trace.h
> @@ -9,7 +9,6 @@
>
> #undef TRACE_SYSTEM
> #define TRACE_SYSTEM radeon
> -#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
> #define TRACE_INCLUDE_FILE radeon_trace
>
> TRACE_EVENT(radeon_bo_create,
> -- 2.1.4
>
--
Masami HIRAMATSU
Linux Technology Research Center, System Productivity Research Dept.
Center for Technology Innovation - Systems Engineering
Hitachi, Ltd., Research & Development Group
E-mail: [email protected]