commit eae8fe3d01ba43df32e868eeb5a5f33a095beab8
author Jesse Hall <jessehall@google.com> Tue May 15 22:56:14 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 15 22:56:14 2018 +0000
tree 363ea32069aae897b71f560fefe1072772bb60f8
parent 7c964b3d794f43f24a89f0a55b9e1daeff51fac2
parent ae001a33fbfeb30f91ab33e675de7c3efa49111c

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

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 70164ea..9060937 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -186,7 +186,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" },