Remove __ASSUME_POSIX_CPU_TIMERS.

1 files changed, 3 insertions, 51 deletions

diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index f75ceca249..fde662177b 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -31,38 +31,6 @@
 # include <bits/libc-vdso.h>
 #endif
 
-#if __ASSUME_POSIX_CPU_TIMERS <= 0 && defined __NR_clock_settime
-extern int __libc_missing_posix_cpu_timers attribute_hidden;
-
-static int
-maybe_syscall_settime_cpu (clockid_t clock_id, const struct timespec *tp)
-{
-  int e = EINVAL;
-
-  if (!__libc_missing_posix_cpu_timers)
-    {
-      INTERNAL_SYSCALL_DECL (err);
-      int r = INTERNAL_SYSCALL (clock_settime, err, 2, clock_id, tp);
-      if (!INTERNAL_SYSCALL_ERROR_P (r, err))
-	return 0;
-
-      e = INTERNAL_SYSCALL_ERRNO (r, err);
-      if (e == EINVAL)
-	{
-	  /* Check whether the kernel supports CPU clocks at all.
-	     If not, record it for the future.  */
-	  r = INTERNAL_VSYSCALL (clock_getres, err, 2,
-				 MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED),
-				 NULL);
-	  if (INTERNAL_SYSCALL_ERROR_P (r, err))
-	    __libc_missing_posix_cpu_timers = 1;
-	}
-    }
-
-  return e;
-}
-#endif
-
 
 /* The REALTIME clock is definitely supported in the kernel.  */
 #define SYSDEP_SETTIME \
@@ -70,27 +38,11 @@ maybe_syscall_settime_cpu (clockid_t clock_id, const struct timespec *tp)
     retval = INLINE_SYSCALL (clock_settime, 2, clock_id, tp);		      \
     break
 
-#ifdef __NR_clock_settime
 /* We handled the REALTIME clock here.  */
-# define HANDLED_REALTIME	1
-#endif
+#define HANDLED_REALTIME	1
 
-#if __ASSUME_POSIX_CPU_TIMERS > 0
-# define HANDLED_CPUTIME 1
-# define SYSDEP_SETTIME_CPU \
+#define HANDLED_CPUTIME 1
+#define SYSDEP_SETTIME_CPU \
   retval = INLINE_SYSCALL (clock_settime, 2, clock_id, tp)
-#elif defined __NR_clock_settime
-# define SYSDEP_SETTIME_CPU \
-  retval = maybe_syscall_settime_cpu (clock_id, tp);			      \
-  if (retval == 0)							      \
-    break;								      \
-  if (retval != EINVAL || !__libc_missing_posix_cpu_timers)		      \
-    {									      \
-      __set_errno (retval);						      \
-      retval = -1;							      \
-      break;								      \
-    }									      \
-  do { } while (0)
-#endif
 
 #include <sysdeps/unix/clock_settime.c>