commit 6ea4e35ab1c4fc93b9dc176423e6e425c85bf360
author Riley Andrews <riandrews@google.com> Wed Nov 04 00:47:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 04 00:47:32 2015 +0000
tree 5b617214bdb9db0b4c69069edf43abe8d2c17eb3
parent cdb42259d2d0b82af58ae54227f2a8162106c94a
parent b813f5e2e8b6a799b14720097bb9e1394e2c5262

Merge "Add ipi tracing to irq tracing." am: c84da67d72
am: b813f5e2e8

* commit 'b813f5e2e8b6a799b14720097bb9e1394e2c5262':
  Add ipi tracing to irq tracing.

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index d63019b..3c9d899 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -99,6 +99,7 @@
     } },
     { "irq",        "IRQ Events",   0, {
         { REQ,      "/sys/kernel/debug/tracing/events/irq/enable" },
+        { OPT,      "/sys/kernel/debug/tracing/events/ipi/enable" },
     } },
     { "freq",       "CPU Frequency",    0, {
         { REQ,      "/sys/kernel/debug/tracing/events/power/cpu_frequency/enable" },