aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--NEWS2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c54cee..cdfa6cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-13 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #17263]
+ * sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c: Include
+ <stdint.h>.
+ (__get_clockfreq): Use uint64_t instead of hp_timing_t in
+ INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK call.
+
2014-08-13 Siddhesh Poyarekar <siddhesh@redhat.com>
* sysdeps/x86/fpu/bits/mathinline.h: Fix typo in comment.
diff --git a/NEWS b/NEWS
index ca01275..2220e97 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ Version 2.20
16977, 16978, 16984, 16990, 16996, 17009, 17022, 17031, 17042, 17048,
17050, 17058, 17061, 17062, 17069, 17075, 17078, 17079, 17084, 17086,
17088, 17092, 17097, 17125, 17135, 17137, 17150, 17153, 17213, 17259,
- 17261, 17262.
+ 17261, 17262, 17263.
* Reverted change of ABI data structures for s390 and s390x:
On s390 and s390x the size of struct ucontext and jmp_buf was increased in
diff --git a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
index 8b37943..62217b1 100644
--- a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
+++ b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
@@ -18,6 +18,7 @@
#include <ctype.h>
#include <fcntl.h>
+#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include <libc-internal.h>
@@ -42,7 +43,7 @@ __get_clockfreq (void)
#ifdef SHARED
INTERNAL_SYSCALL_DECL (err);
timebase_freq =
- INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK (get_tbfreq, err, hp_timing_t, 0);
+ INTERNAL_VSYSCALL_NO_SYSCALL_FALLBACK (get_tbfreq, err, uint64_t, 0);
if (INTERNAL_SYSCALL_ERROR_P (timebase_freq, err)
&& INTERNAL_SYSCALL_ERRNO (timebase_freq, err) == ENOSYS)
#endif