From 640ac3f1bf2e575b514645fc03cceeeacf7bd845 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 11 Nov 2012 15:46:01 -0800 Subject: [PATCH] Fix check-localplt regressions on sparc. * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Include inttypes.h (__get_clockfreq_via_proc_openprom): Use __open, __read, and __close rather than their public counterparts. --- ChangeLog | 7 +++++++ sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 936b8ca..ba9ecf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-11-11 David S. Miller + + * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Include + inttypes.h + (__get_clockfreq_via_proc_openprom): Use __open, __read, and + __close rather than their public counterparts. + 2012-11-10 Joseph Myers * conform/data/semaphore.h-data [XPG3 || XPG4]: Disable whole diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c index cb31e5c..2c9812e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -123,14 +124,14 @@ __get_clockfreq_via_proc_openprom (void) int clkfreq_fd; __stpcpy (prop, "/clock-frequency"); - clkfreq_fd = open (node, O_RDONLY); + clkfreq_fd = __open (node, O_RDONLY); if (clkfreq_fd != -1) { - if (read (clkfreq_fd, type_string, - sizeof (type_string)) > 0) + if (__read (clkfreq_fd, type_string, + sizeof (type_string)) > 0) result = (hp_timing_t) strtoumax (type_string, NULL, 16); - close (clkfreq_fd); + __close (clkfreq_fd); } } __close (fd); -- 2.7.4