summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2015-05-07 16:45:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 16:45:29 +0000
commit274daec7d5b68157377849020b49f16512233934 (patch)
tree8c8807f2f3f7b803f3cf6c7e2c7cdce871066529 /cmds
parente63633e53d67aeeef8ed93759f7db53bc8ba0a72 (diff)
parent9a104951a387a84709705405732a69f690d2c9f0 (diff)
downloadframeworks_native-274daec7d5b68157377849020b49f16512233934.zip
frameworks_native-274daec7d5b68157377849020b49f16512233934.tar.gz
frameworks_native-274daec7d5b68157377849020b49f16512233934.tar.bz2
am 9a104951: am 05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"
* commit '9a104951a387a84709705405732a69f690d2c9f0': Added Voltage and Current regulator ftrace events to atrace
Diffstat (limited to 'cmds')
-rw-r--r--cmds/atrace/atrace.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 515d761..4100fa3 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -137,6 +137,9 @@ static const TracingCategory k_categories[] = {
{ REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_wake/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/vmscan/mm_vmscan_kswapd_sleep/enable" },
} },
+ { "regulators", "Voltage and Current Regulators", 0, {
+ { REQ, "/sys/kernel/debug/tracing/events/regulator/enable" },
+ } },
};
/* Command line options */