2 files changed, 16 insertions, 30 deletions
diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
index 27a9fc526..b2f06f9ef 100644
--- a/libc/sysdeps/linux/common/epoll.c
+++ b/libc/sysdeps/linux/common/epoll.c
@@ -2,9 +2,9 @@
 /*
  * epoll_create() / epoll_ctl() / epoll_wait() for uClibc
  *
- * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
 #include "syscalls.h"
@@ -14,52 +14,37 @@
  * epoll_create()
  */
 #ifdef __NR_epoll_create
-#define __NR___syscall_epoll_create __NR_epoll_create
-static inline _syscall1(int, __syscall_epoll_create, int, size);
-#endif
-
+_syscall1(int, epoll_create, int, size);
+#else
 int epoll_create(int size)
 {
-#ifdef __NR_epoll_create
-	return (__syscall_epoll_create(size));
-#else
     __set_errno(ENOSYS);
     return -1;
-#endif
 }
+#endif
 
 /*
  * epoll_ctl()
  */
 #ifdef __NR_epoll_ctl
-#define __NR___syscall_epoll_ctl __NR_epoll_ctl
-static inline _syscall4(int, __syscall_epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, event);
-#endif
-
+_syscall4(int,epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, event);
+#else
 int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
 {
-#ifdef __NR_epoll_ctl
-	return (__syscall_epoll_ctl(epfd, op, fd, event));
-#else
 	__set_errno(ENOSYS);
 	return -1;
-#endif
 }
+#endif
 
 /*
  * epoll_wait()
  */
 #ifdef __NR_epoll_wait
-#define __NR___syscall_epoll_wait __NR_epoll_wait
-static inline _syscall4(int, __syscall_epoll_wait, int, epfd, struct epoll_event *, events, int, maxevents, int, timeout);
-#endif
-
+_syscall4(int, epoll_wait, int, epfd, struct epoll_event *, events, int, maxevents, int, timeout);
+#else
 int epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
 {
-#ifdef __NR_epoll_wait
-	return (__syscall_epoll_wait(epfd, events, maxevents, timeout));
-#else
 	__set_errno(ENOSYS);
 	return -1;
-#endif
 }
+#endif
diff --git a/libc/sysdeps/linux/common/prctl.c b/libc/sysdeps/linux/common/prctl.c
index e908c44cd..52d1e76e0 100644
--- a/libc/sysdeps/linux/common/prctl.c
+++ b/libc/sysdeps/linux/common/prctl.c
@@ -2,12 +2,13 @@
 /*
  * prctl() for uClibc
  *
- * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
  *
- * GNU Library General Public License (LGPL) version 2 or later.
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
 #include "syscalls.h"
 #include <stdarg.h>
-//#include <sys/prctl.h>
-_syscall5(int, prctl, int, a, int, b, int, c, int, d, int, e);
+/* psm: including sys/prctl.h would depend on kernel headers */
+extern int prctl (int, long, long, long, long);
+_syscall5(int, prctl, int, option, long, arg2, long, arg3, long, arg4, long, arg5);