> --- a/security/device_cgroup.c > +++ b/security/device_cgroup.c > @@ -58,11 +58,9 @@ static inline struct dev_cgroup *css_to_devcgroup(struct cgroup_subsys_state *s) > > static inline struct dev_cgroup *task_devcgroup(struct task_struct *task) > { > - return css_to_devcgroup(task_css(task, devices_subsys_id)); > + return css_to_devcgroup(task_css(task, devices_cgrp_id)); > } > > -struct cgroup_subsys devices_subsys; > - > /* > * called under devcgroup_mutex > */ > @@ -684,13 +682,11 @@ static struct cftype dev_cgroup_files[] = { > { } /* terminate */ > }; > > -struct cgroup_subsys devices_subsys = { > - .name = "devices", > +struct cgroup_subsys devices_cgrp_subsys = { > .css_alloc = devcgroup_css_alloc, > .css_free = devcgroup_css_free, > .css_online = devcgroup_online, > .css_offline = devcgroup_offline, > - .subsys_id = devices_subsys_id, > .base_cftypes = dev_cgroup_files, > }; ACK -- Aristeu _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/containers