summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2014-11-21 20:36:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 20:36:08 +0000
commit236e790608aa3d60630d3946f54fb9a3ae01b19f (patch)
treed57c73b8226e3b134624df56973687fc0e62fd15 /cmds
parent8b1a27740dc9910ffbdf0df775056b6647fe111c (diff)
parente4c7ec847d83edfb54c215f3ab6093efeb17a586 (diff)
downloadframeworks_native-236e790608aa3d60630d3946f54fb9a3ae01b19f.zip
frameworks_native-236e790608aa3d60630d3946f54fb9a3ae01b19f.tar.gz
frameworks_native-236e790608aa3d60630d3946f54fb9a3ae01b19f.tar.bz2
am e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
* commit 'e4c7ec847d83edfb54c215f3ab6093efeb17a586': atrace: make fs-specific sysfs entries optional
Diffstat (limited to 'cmds')
-rw-r--r--cmds/atrace/atrace.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index f0a52d8..a3d210a 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -106,14 +106,14 @@ static const TracingCategory k_categories[] = {
{ REQ, "/sys/kernel/debug/tracing/events/power/cpu_idle/enable" },
} },
{ "disk", "Disk I/O", 0, {
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/enable" },
- { REQ, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_enter/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_sync_file_exit/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_begin/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/f2fs/f2fs_write_end/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_begin/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_da_write_end/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_enter/enable" },
+ { OPT, "/sys/kernel/debug/tracing/events/ext4/ext4_sync_file_exit/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/block/block_rq_issue/enable" },
{ REQ, "/sys/kernel/debug/tracing/events/block/block_rq_complete/enable" },
} },