Merge "Move sysfs cpu hotplug labeling to genfs_contexts" into oc-dev
diff --git a/private/file_contexts b/private/file_contexts
index 7384ce8..aefd95f 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -454,7 +454,6 @@
#
/sys/class/leds(/.*)? u:object_r:sysfs_leds:s0
/sys/devices/platform/nfc-power/nfc_power -- u:object_r:sysfs_nfc_power_writable:s0
-/sys/devices/system/cpu(/.*)? u:object_r:sysfs_devices_system_cpu:s0
/sys/devices/virtual/block/zram\d+(/.*)? u:object_r:sysfs_zram:s0
/sys/devices/virtual/block/zram\d+/uevent u:object_r:sysfs_zram_uevent:s0
/sys/devices/virtual/misc/hw_random(/.*)? u:object_r:sysfs_hwrandom:s0
diff --git a/private/genfs_contexts b/private/genfs_contexts
index c2cfa2c..a2d9b89 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -47,6 +47,7 @@
genfscon cgroup / u:object_r:cgroup:s0
# sysfs labels can be set by userspace.
genfscon sysfs / u:object_r:sysfs:s0
+genfscon sysfs /devices/system/cpu u:object_r:sysfs_devices_system_cpu:s0
genfscon inotifyfs / u:object_r:inotify:s0
genfscon vfat / u:object_r:vfat:s0
genfscon debugfs / u:object_r:debugfs:s0