[PATCH v3 21/48] inotify_init: Use inotify_init1 if inotify_init syscall is not defined

Markos Chandras markos.chandras at gmail.com
Wed Jan 23 11:41:45 UTC 2013


From: Markos Chandras <markos.chandras at imgtec.com>

Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>
---
 libc/sysdeps/linux/common/inotify.c | 7 +++++++
 libc/sysdeps/linux/common/stubs.c   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libc/sysdeps/linux/common/inotify.c b/libc/sysdeps/linux/common/inotify.c
index e2f3836..b32b9ec 100644
--- a/libc/sysdeps/linux/common/inotify.c
+++ b/libc/sysdeps/linux/common/inotify.c
@@ -19,6 +19,13 @@ _syscall0(int, inotify_init)
 _syscall1(int, inotify_init1, int, flags)
 #endif
 
+#if defined(__NR_inotify_init1) && !defined(__NR_inotify_init)
+int inotify_init(void)
+{
+	return INLINE_SYSCALL(inotify_init1, 1, 0);
+}
+#endif
+
 #ifdef __NR_inotify_add_watch
 _syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t, mask)
 #endif
diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
index 2faf6ec..f429467 100644
--- a/libc/sysdeps/linux/common/stubs.c
+++ b/libc/sysdeps/linux/common/stubs.c
@@ -176,7 +176,8 @@ make_stub(init_module)
 make_stub(inotify_add_watch)
 #endif
 
-#if !defined __NR_inotify_init && defined __UCLIBC_LINUX_SPECIFIC__
+#if !defined __NR_inotify_init && defined __UCLIBC_LINUX_SPECIFIC__ \
+		&& !defined(__NR_inotify_init1)
 make_stub(inotify_init)
 #endif
 
-- 
1.8.1.1




More information about the uClibc mailing list