From a4e8afded933727b0ba9e0a21b0e2fc1ed457592 Mon Sep 17 00:00:00 2001 From: Greg Thelen Date: Wed, 28 Nov 2012 13:50:45 -0800 Subject: [PATCH] --- yaml --- r: 339360 b: refs/heads/master c: 9718ceb3431acdeee9bdec5c18e18266333970aa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/cgroup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4fca449f7d1d..afa5877d0d1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 205a872bd6f9a9a09ef035ef1e90185a8245cc58 +refs/heads/master: 9718ceb3431acdeee9bdec5c18e18266333970aa diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index 589433f7a74b..46dcdbd7485b 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/kernel/cgroup.c @@ -3767,7 +3767,7 @@ static int cgroup_event_wake(wait_queue_t *wait, unsigned mode, if (flags & POLLHUP) { __remove_wait_queue(event->wqh, &event->wait); spin_lock(&cgrp->event_list_lock); - list_del(&event->list); + list_del_init(&event->list); spin_unlock(&cgrp->event_list_lock); /* * We are in atomic context, but cgroup_event_remove() may @@ -4341,7 +4341,7 @@ static int cgroup_destroy_locked(struct cgroup *cgrp) list_splice_init(&cgrp->event_list, &tmp_list); spin_unlock(&cgrp->event_list_lock); list_for_each_entry_safe(event, tmp, &tmp_list, list) { - list_del(&event->list); + list_del_init(&event->list); remove_wait_queue(event->wqh, &event->wait); eventfd_signal(event->eventfd, 1); schedule_work(&event->remove);