On Wed, Nov 20, 2019 at 10:54 PM Stephen Rothwell sfr@canb.auug.org.au wrote:

Hi all,

After merging the tip tree, today's linux-next build (x86_64 allmodconfig) failed like this:

In file included from include/trace/define_trace.h:102, from drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:502, from drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c:29: include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:476:52: error: expected expression before ';' token 476 | __string(ring, sched_job->base.sched->name); | ^ include/trace/trace_events.h:435:2: note: in definition of macro 'DECLARE_EVENT_CLASS' 435 | tstruct \ | ^~~~~~~ include/trace/trace_events.h:77:9: note: in expansion of macro 'PARAMS' 77 | PARAMS(tstruct), \ | ^~~~~~ include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:472:1: note: in expansion of macro 'TRACE_EVENT' 472 | TRACE_EVENT(amdgpu_ib_pipe_sync, | ^~~~~~~~~~~ include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:475:6: note: in expansion of macro 'TP_STRUCT__entry' 475 | TP_STRUCT__entry( | ^~~~~~~~~~~~~~~~

Caused by commit

2c2fdb8bca29 ("drm/amdgpu: fix amdgpu trace event print string format error")

from the drm tree interacting with commit

60fdad00827c ("ftrace: Rework event_create_dir()")

from the tip tree.

I have added the following merge fix patch:

Applied. Thanks!

Alex

From: Stephen Rothwell sfr@canb.auug.org.au Date: Thu, 21 Nov 2019 14:46:00 +1100 Subject: [PATCH] merge fix for "ftrace: Rework event_create_dir()"

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h index f940526c5889..63e734a125fb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h @@ -473,7 +473,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence), TP_ARGS(sched_job, fence), TP_STRUCT__entry(

•                        __string(ring, sched_job->base.sched->name);
  

•                        __string(ring, sched_job->base.sched->name)
                         __field(uint64_t, id)
                         __field(struct dma_fence *, fence)
                         __field(uint64_t, ctx)
  

-- 2.23.0

-- Cheers, Stephen Rothwell _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel