commit 7259edacb37b484823af5df9371ae86146597b67
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 14 21:46:36 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 14 21:46:36 2020 +0000
tree 2702a41888e243d57ac060649208655b39bbe7a9
parent c72df4e2a64b42215ef60116795f38006d2a8a69
parent 355ff8c7c15310df1159e2a9290c50d24317c600

Merge "libcutils must check /sys/kernel/tracing for tracefs first"

libcutils/trace-dev.cpp

diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp
index 5a09a2d..1ab63dc 100644
--- a/libcutils/trace-dev.cpp
+++ b/libcutils/trace-dev.cpp
@@ -30,9 +30,9 @@
 
 static void atrace_init_once()
 {
-    atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC);
+    atrace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_WRONLY | O_CLOEXEC);
     if (atrace_marker_fd == -1) {
-        atrace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_WRONLY | O_CLOEXEC);
+        atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC);
     }
 
     if (atrace_marker_fd == -1) {