summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorWilly Tarreau <w@1wt.eu>2021-01-21 08:20:28 +0100
committerPaul E. McKenney <paulmck@kernel.org>2021-01-21 10:06:45 -0800
commit70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17 (patch)
treee69a911fda92ddb3c86c0f3f35a7184ab9471901 /tools
parent5b1c827ca3b349801e2faff4185118cfa74f94c6 (diff)
downloadlinux-stable-70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17.tar.gz
linux-stable-70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17.tar.bz2
linux-stable-70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17.zip
tools/nolibc: Get timeval, timespec and timezone from linux/time.h
The definitions of timeval(), timespec() and timezone() conflict with linux/time.h when building, so this commit takes them directly from linux/time.h. This is a port of nolibc's upstream commit dc45f5426b0c to the Linux kernel. Fixes: 66b6f755ad45 ("rcutorture: Import a copy of nolibc") Tested-by: Valentin Schneider <valentin.schneider@arm.com> Tested-by: Mark Rutland <mark.rutland@arm.com> [arm64] Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/include/nolibc/nolibc.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index 833693faf53c..611d9d15899d 100644
--- a/tools/include/nolibc/nolibc.h
+++ b/tools/include/nolibc/nolibc.h
@@ -94,6 +94,7 @@
#include <asm/errno.h>
#include <linux/fs.h>
#include <linux/loop.h>
+#include <linux/time.h>
#define NOLIBC
@@ -152,24 +153,6 @@ struct pollfd {
short int revents;
};
-/* for select() */
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-
-/* for pselect() */
-struct timespec {
- long tv_sec;
- long tv_nsec;
-};
-
-/* for gettimeofday() */
-struct timezone {
- int tz_minuteswest;
- int tz_dsttime;
-};
-
/* for getdents64() */
struct linux_dirent64 {
uint64_t d_ino;