diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /kernel/cgroup_debug.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'kernel/cgroup_debug.c')
| -rw-r--r-- | kernel/cgroup_debug.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/cgroup_debug.c b/kernel/cgroup_debug.c index daca6209202d..0c92d797baa6 100644 --- a/kernel/cgroup_debug.c +++ b/kernel/cgroup_debug.c | |||
| @@ -40,9 +40,7 @@ static u64 taskcount_read(struct cgroup *cont, struct cftype *cft) | |||
| 40 | { | 40 | { |
| 41 | u64 count; | 41 | u64 count; |
| 42 | 42 | ||
| 43 | cgroup_lock(); | ||
| 44 | count = cgroup_task_count(cont); | 43 | count = cgroup_task_count(cont); |
| 45 | cgroup_unlock(); | ||
| 46 | return count; | 44 | return count; |
| 47 | } | 45 | } |
| 48 | 46 | ||