diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 00:35:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 00:35:12 -0400 |
| commit | 92c1d6522135050cb377a18cc6e30d08dfb87efb (patch) | |
| tree | 5d2fa3051c975f1c459b6949f9e71cac2edf74de /security | |
| parent | df2a40f549e6b73aad98b0c03f400c00d284816b (diff) | |
| parent | 99c8b231ae6c6ca4ca2fd1c0b3701071f589661f (diff) | |
Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"Documentation updates and the addition of cgroup_parse_float() which
will be used by new controllers including blk-iocost"
* 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
docs: cgroup-v1: convert docs to ReST and rename to *.rst
cgroup: Move cgroup_parse_float() implementation out of CONFIG_SYSFS
cgroup: add cgroup_parse_float()
Diffstat (limited to 'security')
| -rw-r--r-- | security/device_cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index dc28914fa72e..c07196502577 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
| @@ -509,7 +509,7 @@ static inline int may_allow_all(struct dev_cgroup *parent) | |||
| 509 | * This is one of the three key functions for hierarchy implementation. | 509 | * This is one of the three key functions for hierarchy implementation. |
| 510 | * This function is responsible for re-evaluating all the cgroup's active | 510 | * This function is responsible for re-evaluating all the cgroup's active |
| 511 | * exceptions due to a parent's exception change. | 511 | * exceptions due to a parent's exception change. |
| 512 | * Refer to Documentation/cgroup-v1/devices.txt for more details. | 512 | * Refer to Documentation/cgroup-v1/devices.rst for more details. |
| 513 | */ | 513 | */ |
| 514 | static void revalidate_active_exceptions(struct dev_cgroup *devcg) | 514 | static void revalidate_active_exceptions(struct dev_cgroup *devcg) |
| 515 | { | 515 | { |