Merge git://git.infradead.org/~dwmw2/random-2.6

[pandora-kernel.git] / include / linux / eventfd.h

diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index 0d6ecc6..a667637 100644 (file)
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -8,10 +8,14 @@
 #ifndef _LINUX_EVENTFD_H
 #define _LINUX_EVENTFD_H
 
+#ifdef CONFIG_EVENTFD
 
-#ifdef __KERNEL__
+/* For O_CLOEXEC and O_NONBLOCK */
+#include <linux/fcntl.h>
 
-#ifdef CONFIG_EVENTFD
+/* Flags for eventfd2.  */
+#define EFD_CLOEXEC O_CLOEXEC
+#define EFD_NONBLOCK O_NONBLOCK
 
 struct file *eventfd_fget(int fd);
 int eventfd_signal(struct file *file, int n);
@@ -19,11 +23,10 @@ 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 */
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_EVENTFD_H */