From 3905f12713df17195118d9caa321299d963ee315 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 8 Sep 2015 18:15:50 +0200 Subject: cgroups: make sure the "devices" controller's enum is named the same way as the controller in the kernel Follow-up to 5bf8002a3a6723ce50331c024122078552fb600a. --- src/basic/cgroup-util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/basic/cgroup-util.h') diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 6fd6d80590..16d439fd9d 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -34,7 +34,7 @@ typedef enum CGroupController { CGROUP_CONTROLLER_CPUACCT, CGROUP_CONTROLLER_BLKIO, CGROUP_CONTROLLER_MEMORY, - CGROUP_CONTROLLER_DEVICE, + CGROUP_CONTROLLER_DEVICES, _CGROUP_CONTROLLER_MAX, _CGROUP_CONTROLLER_INVALID = -1, } CGroupController; @@ -47,7 +47,7 @@ typedef enum CGroupMask { CGROUP_MASK_CPUACCT = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_CPUACCT), CGROUP_MASK_BLKIO = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_BLKIO), CGROUP_MASK_MEMORY = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_MEMORY), - CGROUP_MASK_DEVICE = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_DEVICE), + CGROUP_MASK_DEVICES = CGROUP_CONTROLLER_TO_MASK(CGROUP_CONTROLLER_DEVICES), _CGROUP_MASK_ALL = CGROUP_CONTROLLER_TO_MASK(_CGROUP_CONTROLLER_MAX) - 1 } CGroupMask; -- cgit v1.2.3-54-g00ecf