diff options
| author | Tejun Heo <tj@kernel.org> | 2013-11-23 00:32:25 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-11-23 00:32:25 +0100 |
| commit | edab95103d3a1eb5e3faf977eae4ad0b5bf5669c (patch) | |
| tree | 812c111f94b0ae31bf88b49e7c37a7f5ba353eef /Documentation/cgroups | |
| parent | cgroup: use a dedicated workqueue for cgroup destruction (diff) | |
| parent | cgroup: unexport cgroup_css() and remove __file_cft() (diff) | |
| download | linux-edab95103d3a1eb5e3faf977eae4ad0b5bf5669c.tar.xz linux-edab95103d3a1eb5e3faf977eae4ad0b5bf5669c.zip | |
cgroup: Merge branch 'memcg_event' into for-3.14
Merge v3.12 based patch series to move cgroup_event implementation to
memcg into for-3.14. The following two commits cause a conflict in
kernel/cgroup.c
2ff2a7d03bbe4 ("cgroup: kill css_id")
79bd9814e5ec9 ("cgroup, memcg: move cgroup_event implementation to memcg")
Each patch removes a struct definition from kernel/cgroup.c. As the
two are adjacent, they cause a context conflict. Easily resolved by
removing both structs.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'Documentation/cgroups')
| -rw-r--r-- | Documentation/cgroups/cgroups.txt | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt index 638bf17ff869..821de56d1580 100644 --- a/Documentation/cgroups/cgroups.txt +++ b/Documentation/cgroups/cgroups.txt @@ -24,7 +24,6 @@ CONTENTS: 2.1 Basic Usage 2.2 Attaching processes 2.3 Mounting hierarchies by name - 2.4 Notification API 3. Kernel API 3.1 Overview 3.2 Synchronization @@ -472,25 +471,6 @@ you give a subsystem a name. The name of the subsystem appears as part of the hierarchy description in /proc/mounts and /proc/<pid>/cgroups. -2.4 Notification API --------------------- - -There is mechanism which allows to get notifications about changing -status of a cgroup. - -To register a new notification handler you need to: - - create a file descriptor for event notification using eventfd(2); - - open a control file to be monitored (e.g. memory.usage_in_bytes); - - write "<event_fd> <control_fd> <args>" to cgroup.event_control. - Interpretation of args is defined by control file implementation; - -eventfd will be woken up by control file implementation or when the -cgroup is removed. - -To unregister a notification handler just close eventfd. - -NOTE: Support of notifications should be implemented for the control -file. See documentation for the subsystem. 3. Kernel API ============= |