diff options
| author | Tejun Heo <tj@kernel.org> | 2017-02-02 13:50:35 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2017-02-02 13:50:35 -0500 |
| commit | 63f1ca59453aadae81f702840c7ac6ea8b9f9262 (patch) | |
| tree | 5dc559d4dc33c8e1408f757d8853b23033ea118f /init | |
| parent | 576dd464505fc53d501bb94569db76f220104d28 (diff) | |
| parent | 7896dfb0a6180beb51bf34b32c9427984cb052c4 (diff) | |
Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11
Merge in to resolve conflicts in Documentation/cgroup-v2.txt. The
conflicts are from multiple section additions and trivial to resolve.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 223b734abccd..ef80d46a32b6 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1090,6 +1090,16 @@ config CGROUP_PIDS since the PIDs limit only affects a process's ability to fork, not to attach to a cgroup. +config CGROUP_RDMA + bool "RDMA controller" + help + Provides enforcement of RDMA resources defined by IB stack. + It is fairly easy for consumers to exhaust RDMA resources, which + can result into resource unavailability to other consumers. + RDMA controller is designed to stop this from happening. + Attaching processes with active RDMA resources to the cgroup + hierarchy is allowed even if can cross the hierarchy's limit. + config CGROUP_FREEZER bool "Freezer controller" help |