Update.

	* sysdeps/unix/sysv/linux/fcntl.c (__fcntl_nocancel): Remove
	static inline __attribute ((always_inline)).  Don't define if
	NO_CANCELLATION.
	(__libc_fcntl): Use INLINE_SYSCALL directly instead of
	__fcntl_nocancel.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c (__fcntl_nocancel):
	Remove static inline __attribute ((always_inline)).  Don't define
	if NO_CANCELLATION.
	(__libc_fcntl): Use INLINE_SYSCALL directly instead of
	__fcntl_nocancel.
	* sysdeps/unix/sysv/linux/i386/fcntl.c (__fcntl_nocancel): Define to
	__libc_fcntl if NO_CANCELLATION and __ASSUME_FCNTL64 == 0.
	Don't define at all if NO_CANCELLATION and __ASSUME_FCNTL64 > 0.
	(__libc_fcntl): Don't define if __fcntl_nocancel is a macro.

1 files changed, 4 insertions, 5 deletions

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
index 95b817bc40..e7ec85de63 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
@@ -25,9 +25,7 @@
 #include <sys/syscall.h>
 
 
-#ifdef NO_CANCELLATION
-static inline __attribute ((always_inline))
-#endif
+#ifndef NO_CANCELLATION
 int
 __fcntl_nocancel (int fd, int cmd, ...)
 {
@@ -40,6 +38,7 @@ __fcntl_nocancel (int fd, int cmd, ...)
 
   return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
 }
+#endif
 
 
 int
@@ -56,11 +55,11 @@ __libc_fcntl (int fd, int cmd, ...)
     cmd -= F_GETLK64 - F_GETLK;
 
   if (SINGLE_THREAD_P || cmd != F_SETLKW)
-    return __fcntl_nocancel (fd, cmd, arg);
+    return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
 
   int oldtype = LIBC_CANCEL_ASYNC ();
 
-  int result = __fcntl_nocancel (fd, cmd, arg);
+  int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
 
   LIBC_CANCEL_RESET (oldtype);