merge fix for "ftrace: Rework event_create_dir()"
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Nov 2019 03:54:03 +0000 (14:54 +1100)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 22 Nov 2019 19:55:12 +0000 (14:55 -0500)
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h

index f940526..63e734a 100644 (file)
@@ -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)