Merge branch 'linus' into core/iommu

[mirror_ubuntu-artful-kernel.git] / include / linux / eventfd.h

diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
index a701399b7fed915e8cbd057be25a57d32bb2de10..a667637b54e3912783c9f1e086c57df74784e05b 100644 (file)
--- a/include/linux/eventfd.h
+++ b/include/linux/eventfd.h
@@ -10,6 +10,13 @@
 
 #ifdef CONFIG_EVENTFD
 
+/* For O_CLOEXEC and O_NONBLOCK */
+#include <linux/fcntl.h>
+
+/* 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);