diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
| commit | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch) | |
| tree | 0cea46e43f0625244c3d06a71d6559e5ec5419ca /kernel/cgroup_debug.c | |
| parent | 4156e735d3abde8e9243b5d22f7999dd3fffab2e (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | ||