about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-04-27 16:56:50 +0000
committerUlrich Drepper <drepper@redhat.com>2005-04-27 16:56:50 +0000
commitad529081156700dcc9198f3688c4ab63ed09c110 (patch)
tree4d7bde28eaad6ffa81bbac81c63883c6626517a6
parent45bc95b5816ccbe30d7dfbc8be1c64ed12590612 (diff)
downloadglibc-ad529081156700dcc9198f3688c4ab63ed09c110.tar.gz
glibc-ad529081156700dcc9198f3688c4ab63ed09c110.tar.xz
glibc-ad529081156700dcc9198f3688c4ab63ed09c110.zip
* sysdeps/pthread/getcpuclockid.c: Include spinlock.h. cvs/fedora-glibc-20050427T1912
	Fix a typo in kernel-posix-cpy-timers.h include name, use <> instead
	of "" includes.
	(pthread_getcpuclockid): Fix 2 typos.
-rw-r--r--linuxthreads/ChangeLog7
-rw-r--r--linuxthreads/sysdeps/pthread/getcpuclockid.c11
-rw-r--r--nptl/ChangeLog5
3 files changed, 18 insertions, 5 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 20120372f4..8ac6398769 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/pthread/getcpuclockid.c: Include spinlock.h.
+	Fix a typo in kernel-posix-cpy-timers.h include name, use <> instead
+	of "" includes.
+	(pthread_getcpuclockid): Fix 2 typos.
+
 2005-04-27  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/pthread/getcpuclockid.c (pthread_getcpuclockid)
diff --git a/linuxthreads/sysdeps/pthread/getcpuclockid.c b/linuxthreads/sysdeps/pthread/getcpuclockid.c
index 117c22dd37..1c64e6c2be 100644
--- a/linuxthreads/sysdeps/pthread/getcpuclockid.c
+++ b/linuxthreads/sysdeps/pthread/getcpuclockid.c
@@ -1,5 +1,5 @@
 /* pthread_getcpuclockid -- Get POSIX clockid_t for a pthread_t.  Linux version
-   Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,8 +22,9 @@
 #include <sys/time.h>
 #include <time.h>
 #include <internals.h>
-#include "kernel-features.h"
-#include "posix-cpu-timers.h"
+#include <spinlock.h>
+#include <kernel-features.h>
+#include <kernel-posix-cpu-timers.h>
 
 
 #if !(__ASSUME_POSIX_CPU_TIMERS > 0)
@@ -58,12 +59,12 @@ pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id)
 # if !(__ASSUME_POSIX_CPU_TIMERS > 0)
 #  if !(__ASSUME_POSIX_TIMERS > 0)
   if (__libc_missing_posix_timers && !__libc_missing_posix_cpu_timers)
-    __libc_missing_cpu_posix_timers = 1;
+    __libc_missing_posix_cpu_timers = 1;
 #  endif
   if (!__libc_missing_posix_cpu_timers)
     {
       INTERNAL_SYSCALL_DECL (err);
-      int r = INTERNAL_SYSCALL (clock_getres, err, 2, tidclock, NULL);
+      int r = INTERNAL_SYSCALL (clock_getres, err, 2, pidclock, NULL);
       if (!INTERNAL_SYSCALL_ERROR_P (r, err))
 # endif
 	{
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 428e599200..e238a4d584 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/pthread_getcpuclockid.c: Use <> instead
+	of "" includes.
+
 2005-04-27  Ulrich Drepper  <drepper@redhat.com>
 
 	* tst-cancel17.c (do_test): Add arbitrary factor to make sure