* [merged] epoll-keyed-wakeups-v2-make-eventfd-use-keyed-wakeups.patch removed from -mm tree
@ 2009-04-01 18:40 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2009-04-01 18:40 UTC (permalink / raw)
To: davidel, alan, davem, mingo, torvalds, wli, mm-commits
The patch titled
epoll keyed wakeups: make eventfd use keyed wakeups
has been removed from the -mm tree. Its filename was
epoll-keyed-wakeups-v2-make-eventfd-use-keyed-wakeups.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: epoll keyed wakeups: make eventfd use keyed wakeups
From: Davide Libenzi <davidel@xmailserver.org>
Introduce keyed event wakeups inside the eventfd code.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>
Cc: William Lee Irwin III <wli@movementarian.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/eventfd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/eventfd.c~epoll-keyed-wakeups-v2-make-eventfd-use-keyed-wakeups fs/eventfd.c
--- a/fs/eventfd.c~epoll-keyed-wakeups-v2-make-eventfd-use-keyed-wakeups
+++ a/fs/eventfd.c
@@ -51,7 +51,7 @@ int eventfd_signal(struct file *file, in
n = (int) (ULLONG_MAX - ctx->count);
ctx->count += n;
if (waitqueue_active(&ctx->wqh))
- wake_up_locked(&ctx->wqh);
+ wake_up_locked_poll(&ctx->wqh, POLLIN);
spin_unlock_irqrestore(&ctx->wqh.lock, flags);
return n;
@@ -120,7 +120,7 @@ static ssize_t eventfd_read(struct file
ucnt = (ctx->flags & EFD_SEMAPHORE) ? 1 : ctx->count;
ctx->count -= ucnt;
if (waitqueue_active(&ctx->wqh))
- wake_up_locked(&ctx->wqh);
+ wake_up_locked_poll(&ctx->wqh, POLLOUT);
}
spin_unlock_irq(&ctx->wqh.lock);
if (res > 0 && put_user(ucnt, (__u64 __user *) buf))
@@ -169,7 +169,7 @@ static ssize_t eventfd_write(struct file
if (likely(res > 0)) {
ctx->count += ucnt;
if (waitqueue_active(&ctx->wqh))
- wake_up_locked(&ctx->wqh);
+ wake_up_locked_poll(&ctx->wqh, POLLIN);
}
spin_unlock_irq(&ctx->wqh.lock);
_
Patches currently in -mm which might be from davidel@xmailserver.org are
origin.patch
linux-next.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-01 19:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-01 18:40 [merged] epoll-keyed-wakeups-v2-make-eventfd-use-keyed-wakeups.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.