diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-04-06 01:41:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 01:41:22 +0200 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /kernel/cgroup_debug.c | |
| parent | genirq: fix devres.o build for GENERIC_HARDIRQS=n (diff) | |
| parent | Merge branch 'audit.b62' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current (diff) | |
| download | wireguard-linux-9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95.tar.xz wireguard-linux-9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95.zip | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.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) { u64 count; - cgroup_lock(); count = cgroup_task_count(cont); - cgroup_unlock(); return count; } |