metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

2.3.5-2

Browse Source
This commit is contained in:
Jakub Jelinek 2005-04-27 13:20:28 +00:00
parent 82511e5f80
commit d4f6361c18
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
glibc-fedora.patch
View File

@ -3330,7 +3330,7 @@
- } - }
-} -}
--- libc/linuxthreads/sysdeps/pthread/getcpuclockid.c 2005-04-27 13:04:55.000000000 +0200 --- libc/linuxthreads/sysdeps/pthread/getcpuclockid.c 2005-04-27 13:04:55.000000000 +0200
+++ libc/linuxthreads/sysdeps/pthread/getcpuclockid.c 2005-04-27 14:52:42.000000000 +0200 +++ libc/linuxthreads/sysdeps/pthread/getcpuclockid.c 2005-04-27 15:16:42.000000000 +0200
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/* pthread_getcpuclockid -- Get POSIX clockid_t for a pthread_t. Linux version /* 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 Free Software Foundation, Inc.
@ -3338,12 +3338,29 @@
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@ @@ -22,8 +22,9 @@
#include <sys/time.h>
#include <time.h> #include <time.h>
#include <internals.h> #include <internals.h>
+#include <spinlock.h>
#include "kernel-features.h" #include "kernel-features.h"
-#include "posix-cpu-timers.h" -#include "posix-cpu-timers.h"
+#include "kernel-posix-cpu-timers.h" +#include "kernel-posix-cpu-timers.h"
#if !(__ASSUME_POSIX_CPU_TIMERS > 0) #if !(__ASSUME_POSIX_CPU_TIMERS > 0)
@@ -58,12 +59,12 @@ pthread_getcpuclockid (pthread_t thread_
# 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
{