diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
tree | e081135619ee146af5efb9ee883afca950df5757 /kernel/cgroup_debug.c | |
parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
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 | ||