diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-06 09:30:22 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-06 09:30:22 +0300 |
| commit | 8af31363cda93724c237b6ffb24380f4441d2f8d (patch) | |
| tree | dc25d9ff94761b0adc9381aebd06c8e7f77884e3 /drivers/gpu/drm/i915/gvt/trace.h | |
| parent | ddc4becca1409541c2ebb7ecb99b5cef44cf17e4 (diff) | |
| parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
| download | linux-8af31363cda93724c237b6ffb24380f4441d2f8d.tar.xz | |
Merge tag 'v4.16-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/trace.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/trace.h b/drivers/gpu/drm/i915/gvt/trace.h index 7a2511538f34..736bd2bc5127 100644 --- a/drivers/gpu/drm/i915/gvt/trace.h +++ b/drivers/gpu/drm/i915/gvt/trace.h @@ -333,7 +333,7 @@ TRACE_EVENT(render_mmio, TP_PROTO(int old_id, int new_id, char *action, unsigned int reg, unsigned int old_val, unsigned int new_val), - TP_ARGS(old_id, new_id, action, reg, new_val, old_val), + TP_ARGS(old_id, new_id, action, reg, old_val, new_val), TP_STRUCT__entry( __field(int, old_id) |