From: Andrew Morton <akpm@osdl.org>

Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Jens Axboe <axboe@suse.de>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/relay.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/relay.c~relayfs-use-flush_keventd_work kernel/relay.c
--- a/kernel/relay.c~relayfs-use-flush_keventd_work
+++ a/kernel/relay.c
@@ -340,7 +340,7 @@ static void __relay_reset(struct rchan_b
 		INIT_DELAYED_WORK(&buf->wake_readers, NULL);
 	} else {
 		cancel_delayed_work(&buf->wake_readers);
-		flush_scheduled_work();
+		flush_work_keventd(&buf->wake_readers.work);
 	}
 
 	buf->subbufs_produced = 0;
_