Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / staging / android / trace / sync.h

diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h
index a0f80f41677ef6ffae1df895e7e48bb680370597..6b5ce9640ddda54bb793d76a313a3b368052fcb1 100644 (file)
--- a/drivers/staging/android/trace/sync.h
+++ b/drivers/staging/android/trace/sync.h
@@ -5,7 +5,7 @@
 #if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYNC_H
 
-#include "../sync.h"
+#include "../sync_debug.h"
 #include <linux/tracepoint.h>
 
 TRACE_EVENT(sync_timeline,
@@ -15,21 +15,15 @@ TRACE_EVENT(sync_timeline,
 
        TP_STRUCT__entry(
                        __string(name, timeline->name)
-                       __array(char, value, 32)
+                       __field(u32, value)
        ),
 
        TP_fast_assign(
                        __assign_str(name, timeline->name);
-                       if (timeline->ops->timeline_value_str) {
-                               timeline->ops->timeline_value_str(timeline,
-                                                       __entry->value,
-                                                       sizeof(__entry->value));
-                       } else {
-                               __entry->value[0] = '\0';
-                       }
+                       __entry->value = timeline->value;
        ),
 
-       TP_printk("name=%s value=%s", __get_str(name), __entry->value)
+       TP_printk("name=%s value=%d", __get_str(name), __entry->value)
 );
 
 #endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */