Commit 70ca7aea authored Jan 21, 2021 by Willy Tarreau Committed by Paul E. McKenney Jan 21, 2021

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: 66b6f755 ("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>

parent 5b1c827c

tools/include/nolibc/nolibc.h

+1 −18

Original line number	Diff line number	Diff line
		@@ -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;