projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'samsung-soc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...
[cascardo/linux.git]
/
include
/
trace
/
events
/
fence.h
diff --git
a/include/trace/events/fence.h
b/include/trace/events/fence.h
index
98feb1b
..
d6dfa05
100644
(file)
--- a/
include/trace/events/fence.h
+++ b/
include/trace/events/fence.h
@@
-17,7
+17,7
@@
TRACE_EVENT(fence_annotate_wait_on,
TP_STRUCT__entry(
__string(driver, fence->ops->get_driver_name(fence))
- __string(timeline, fence->ops->get_
driver
_name(fence))
+ __string(timeline, fence->ops->get_
timeline
_name(fence))
__field(unsigned int, context)
__field(unsigned int, seqno)