diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-14 09:29:52 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-14 09:29:52 -0400 |
| commit | 23e117fa44429cc054cb27d5621d64e4ced91e52 (patch) | |
| tree | a4b9d0902b9c6f009b2c297515221c1b9bed3af8 /kernel/cgroup.c | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | a93d2f1744206827ccf416e2cdc5018aa503314e (diff) | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-4
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e2769e13980c..4a07d057a265 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
| @@ -3010,7 +3010,7 @@ static int cgroup_event_wake(wait_queue_t *wait, unsigned mode, | |||
| 3010 | unsigned long flags = (unsigned long)key; | 3010 | unsigned long flags = (unsigned long)key; |
| 3011 | 3011 | ||
| 3012 | if (flags & POLLHUP) { | 3012 | if (flags & POLLHUP) { |
| 3013 | remove_wait_queue_locked(event->wqh, &event->wait); | 3013 | __remove_wait_queue(event->wqh, &event->wait); |
| 3014 | spin_lock(&cgrp->event_list_lock); | 3014 | spin_lock(&cgrp->event_list_lock); |
| 3015 | list_del(&event->list); | 3015 | list_del(&event->list); |
| 3016 | spin_unlock(&cgrp->event_list_lock); | 3016 | spin_unlock(&cgrp->event_list_lock); |