Skip to content

Commit b9a4770

Browse files
committed
Merge branch 'for-6.7' into for-next
2 parents ca23320 + a41796b commit b9a4770

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,13 @@ constraint, a threaded controller must be able to handle competition
364364
between threads in a non-leaf cgroup and its child cgroups. Each
365365
threaded controller defines how such competitions are handled.
366366

367+
Currently, the following controllers are threaded and can be enabled
368+
in a threaded cgroup::
369+
370+
- cpu
371+
- cpuset
372+
- perf_event
373+
- pids
367374

368375
[Un]populated Notification
369376
--------------------------

0 commit comments

Comments
 (0)