commit e5912986e68879a852a82323835eb75925f5f7f7
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 21 16:11:23 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 21 16:11:24 2017 +0000
tree dc5c7889dd04f43ab8f8c85e325ee035777f90fd
parent 8ad57ef6640beddd06eaa70e8f50b82ea02a674b
parent ef2a17092c8663a1167b2fd0135df7e80f82643a

Merge "tracefs not debugfs"

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 7ec8d22..ae910de 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -436,12 +436,12 @@
 # debugfs files
 #
 /sys/kernel/debug/mmc0(/.*)?                            u:object_r:debugfs_mmc:s0
-/sys/kernel/debug/tracing(/.*)?				u:object_r:debugfs_tracing:s0
-/sys/kernel/debug/tracing/trace_marker			u:object_r:debugfs_trace_marker:s0
-/sys/kernel/debug/tracing/instances(/.*)?		u:object_r:debugfs_tracing_instances:s0
-/sys/kernel/debug/tracing/instances/wifi/free_buffer	u:object_r:debugfs_wifi_tracing:s0
-/sys/kernel/debug/tracing/instances/wifi/trace		u:object_r:debugfs_wifi_tracing:s0
-/sys/kernel/debug/tracing/instances/wifi/tracing_on	u:object_r:debugfs_wifi_tracing:s0
+/sys/kernel(/debug)?/tracing(/.*)?			u:object_r:debugfs_tracing:s0
+/sys/kernel(/debug)?/tracing/trace_marker		u:object_r:debugfs_trace_marker:s0
+/sys/kernel(/debug)?/tracing/instances(/.*)?		u:object_r:debugfs_tracing_instances:s0
+/sys/kernel(/debug)?/tracing/instances/wifi/free_buffer	u:object_r:debugfs_wifi_tracing:s0
+/sys/kernel(/debug)?/tracing/instances/wifi/trace	u:object_r:debugfs_wifi_tracing:s0
+/sys/kernel(/debug)?/tracing/instances/wifi/tracing_on	u:object_r:debugfs_wifi_tracing:s0
 
 #############################
 # asec containers