diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /include/linux/cgroup.h | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/cgroup.h')
| -rw-r--r-- | include/linux/cgroup.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index e4e8e117d27d..499900d0cee7 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
| @@ -378,6 +378,7 @@ struct cgroup_subsys { | |||
| 378 | * - initiating hotplug events | 378 | * - initiating hotplug events |
| 379 | */ | 379 | */ |
| 380 | struct mutex hierarchy_mutex; | 380 | struct mutex hierarchy_mutex; |
| 381 | struct lock_class_key subsys_key; | ||
| 381 | 382 | ||
| 382 | /* | 383 | /* |
| 383 | * Link to parent, and list entry in parent's children. | 384 | * Link to parent, and list entry in parent's children. |