commit 717702730a98e8239cf70e61ca9c00db8e99f4eb
author Jesse Hall <jessehall@google.com> Tue May 15 17:00:52 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 15 17:00:52 2018 -0700
tree 6e3aaa122e222bf9bd2b03c271f22006f892d093
parent be73cb42572f50d8fb5e8c6a1bfc022107be8462
parent eae8fe3d01ba43df32e868eeb5a5f33a095beab8

Merge "atrace: map 'sync' to linux >= 4.9 fence tracing" into pi-dev
am: eae8fe3d01

Change-Id: I36652bfc94b07c84338e4bbdb57685d8018950a8

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index f5a167c..24217a4 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -187,7 +187,10 @@
         { REQ,      "events/cpufreq_interactive/enable" },
     } },
     { "sync",       "Synchronization",  0, {
-        { REQ,      "events/sync/enable" },
+        // before linux kernel 4.9
+        { OPT,      "events/sync/enable" },
+        // starting in linux kernel 4.9
+        { OPT,      "events/fence/enable" },
     } },
     { "workq",      "Kernel Workqueues", 0, {
         { REQ,      "events/workqueue/enable" },