am e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev

* commit 'e4c7ec847d83edfb54c215f3ab6093efeb17a586':
  atrace: make fs-specific sysfs entries optional
This commit is contained in:
Greg Hackmann 2014-11-21 20:36:08 +00:00 committed by Android Git Automerger
commit 236e790608

View File

@ -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" },
} },