summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-10-02 21:35:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-02 21:35:37 +0000
commitca8079fd05aa5a4c3cd87202ae0ca33832d3ed28 (patch)
tree5f7cc2223a7acae3eb4ca4aad4db5143eccaa3da /rootdir
parentf39f24df2450e82e35323b94ba29bc35ae5d4f60 (diff)
parent9ef989128059ce840178b8f19cde1183d32d9cee (diff)
downloadsystem_core-ca8079fd05aa5a4c3cd87202ae0ca33832d3ed28.zip
system_core-ca8079fd05aa5a4c3cd87202ae0ca33832d3ed28.tar.gz
system_core-ca8079fd05aa5a4c3cd87202ae0ca33832d3ed28.tar.bz2
am 9ef98912: am 5a9d721b: am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
* commit '9ef989128059ce840178b8f19cde1183d32d9cee': init.trace.rc: fix race condition with class_start core
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.trace.rc2
1 files changed, 1 insertions, 1 deletions
diff --git a/rootdir/init.trace.rc b/rootdir/init.trace.rc
index 50944e6..cd8d350 100644
--- a/rootdir/init.trace.rc
+++ b/rootdir/init.trace.rc
@@ -1,6 +1,6 @@
## Permissions to allow system-wide tracing to the kernel trace buffer.
##
-on boot
+on early-boot
# Allow writing to the kernel trace log.
chmod 0222 /sys/kernel/debug/tracing/trace_marker