---

yaml --- r: 339360 b: refs/heads/master c: 9718ceb h: refs/heads/master v: v3
git-mirror · Nov 28, 2012 · a4e8afd · a4e8afd
1 parent 674ebc6
commit a4e8afd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);