commit 5d2e06c8a77cc784d047994ebe4d38ba0d033707
author Joel Fernandes <joelaf@google.com> Mon Jun 05 20:46:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 05 20:46:31 2017 +0000
tree f7a3c09fbbb116922d7131d72418bf05fa2c26f2
parent be83a34f7d731c849e134046a97f8931f56501c0
parent 4b37107002585a085ec8f415dea680b1db73f4a3

Merge "atrace: Enable sched_waking if available" into oc-dev
am: 4b37107002

Change-Id: I961c608a96040cfd87bd55249617c715cb6d6488

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 563b41f..456a797 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -115,6 +115,7 @@
     { "sched",      "CPU Scheduling",   0, {
         { REQ,      "events/sched/sched_switch/enable" },
         { REQ,      "events/sched/sched_wakeup/enable" },
+        { OPT,      "events/sched/sched_waking/enable" },
         { OPT,      "events/sched/sched_blocked_reason/enable" },
         { OPT,      "events/sched/sched_cpu_hotplug/enable" },
     } },