The following commit has been merged into the core/rcu branch of tip:
Commit-ID: 70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17
Gitweb:
https://git.kernel.org/tip/70ca7aea50a27f03aa7e4cc6ee68940d13cbcd17
Author: Willy Tarreau <w...@1wt.eu>
AuthorDate: Thu, 21 Jan 2021 08:20:28 +01:00
Committer: Paul E. McKenney <paul...@kernel.org>
CommitterDate: Thu, 21 Jan 2021 10:06:45 -08:00
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.schnei...@arm.com>
Tested-by: Mark Rutland <mark.rutl...@arm.com> [arm64]
Signed-off-by: Willy Tarreau <w...@1wt.eu>
Signed-off-by: Paul E. McKenney <paul...@kernel.org>
---
tools/include/nolibc/nolibc.h | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h
index 833693f..611d9d1 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;
