From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 27 Jun 2007 21:09:48 +0000 (-0700)
Subject: eventfd: clean compile when CONFIG_EVENTFD=n
X-Git-Tag: v2.6.22-rc7~34
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d2fd89962cd5de6b1fb9c1c789b56bc16f58f121;p=linux-2.6-omap-h63xx.git

eventfd: clean compile when CONFIG_EVENTFD=n

Fix gcc warning and add parameter checking when CONFIG_EVENTFD=n:

fs/aio.c: In function 'aio_complete':
fs/aio.c:955: warning: statement with no effect

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index 0d6ecc60b94..b489fc6d0b6 100644
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -19,7 +19,8 @@ int eventfd_signal(struct file *file, int n);
 #else /* CONFIG_EVENTFD */
 
 #define eventfd_fget(fd) ERR_PTR(-ENOSYS)
-#define eventfd_signal(f, n) 0
+static inline int eventfd_signal(struct file *file, int n)
+{ return 0; }
 
 #endif /* CONFIG_EVENTFD */