Skip to content

Commit

Permalink
tools/nolibc: Get timeval, timespec and timezone from linux/time.h
Browse files Browse the repository at this point in the history
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: 66b6f75 ("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>
  • Loading branch information
Willy Tarreau authored and Paul E. McKenney committed Jan 21, 2021
1 parent 5b1c827 commit 70ca7ae
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions tools/include/nolibc/nolibc.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
#include <asm/errno.h>
#include <linux/fs.h>
#include <linux/loop.h>
#include <linux/time.h>

#define NOLIBC

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 70ca7ae

Please sign in to comment.