merge fix for "ftrace: Rework event_create_dir()"

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Stephen Rothwell and committed by

Alex Deucher 6 years ago a3511321 57fb0ab2

+1 -1

1 changed file

expand all

drivers

gpu

drm

amd

amdgpu

amdgpu_trace.h

+1 -1

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h

··· 473 473 TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence), 474 474 TP_ARGS(sched_job, fence), 475 475 TP_STRUCT__entry( 476 - __string(ring, sched_job->base.sched->name); 476 + __string(ring, sched_job->base.sched->name) 477 477 __field(uint64_t, id) 478 478 __field(struct dma_fence *, fence) 479 479 __field(uint64_t, ctx)