diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libcutils/trace-dev.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libcutils/trace-dev.cpp')
| -rw-r--r-- | libcutils/trace-dev.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp index 5a09a2d39..1ab63dc2f 100644 --- a/libcutils/trace-dev.cpp +++ b/libcutils/trace-dev.cpp @@ -30,9 +30,9 @@ void atrace_set_tracing_enabled(bool enabled) 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) { |