diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:34:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:34:07 -0500 |
| commit | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (patch) | |
| tree | 7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63 /include/linux/cgroup.h | |
| parent | 4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6 (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/acpi/boot.c
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. |