projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e88d78f
)
[PATCH] eventpoll.c compile fix
author
Masoud Asgharifard Sharbiani
<masouds@google.com>
Sun, 27 Aug 2006 08:23:48 +0000
(
01:23
-0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sun, 27 Aug 2006 18:01:31 +0000
(11:01 -0700)
Fix two compile failures in eventpoll.c code which would happen if
DEBUG_EPOLL is bigger than zero.
Signed-off-by: Masoud Sharbiani <masouds@google.com>
Cc: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/eventpoll.c
patch
|
blob
|
blame
|
history
diff --git
a/fs/eventpoll.c
b/fs/eventpoll.c
index 19ffb043abbccfb7fc564d114acabeaae8984a60..3a3567433b921795c9ba6a7fe879a9b6760c923f 100644
(file)
--- a/
fs/eventpoll.c
+++ b/
fs/eventpoll.c
@@
-1168,7
+1168,7
@@
static int ep_unlink(struct eventpoll *ep, struct epitem *epi)
eexit_1:
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_unlink(%p, %p) = %d\n",
- current, ep, epi->file, error));
+ current, ep, epi->f
fd.f
ile, error));
return error;
}
@@
-1236,7
+1236,7
@@
static int ep_poll_callback(wait_queue_t *wait, unsigned mode, int sync, void *k
struct eventpoll *ep = epi->ep;
DNPRINTK(3, (KERN_INFO "[%p] eventpoll: poll_callback(%p) epi=%p ep=%p\n",
- current, epi->file, epi, ep));
+ current, epi->f
fd.f
ile, epi, ep));
write_lock_irqsave(&ep->lock, flags);