diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2020-09-14 17:36:09 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2020-09-21 07:50:58 -0600 |
commit | 72f04da48a9828ba3ae8ac77bea648bda8b7d0ff (patch) | |
tree | 7d94db6524aa6b1a399c6d25706f9d0f799cc715 /tools/io_uring | |
parent | f5cac8b156e8b7b67bb0fdfd19900855bf9569f3 (diff) | |
download | linux-rpi-72f04da48a9828ba3ae8ac77bea648bda8b7d0ff.tar.gz linux-rpi-72f04da48a9828ba3ae8ac77bea648bda8b7d0ff.tar.bz2 linux-rpi-72f04da48a9828ba3ae8ac77bea648bda8b7d0ff.zip |
tools/io_uring: fix compile breakage
It would seem none of the kernel continuous integration does this:
$ cd tools/io_uring
$ make
Otherwise it may have noticed:
cc -Wall -Wextra -g -D_GNU_SOURCE -c -o io_uring-bench.o
io_uring-bench.c
io_uring-bench.c:133:12: error: static declaration of ‘gettid’
follows non-static declaration
133 | static int gettid(void)
| ^~~~~~
In file included from /usr/include/unistd.h:1170,
from io_uring-bench.c:27:
/usr/include/x86_64-linux-gnu/bits/unistd_ext.h:34:16: note:
previous declaration of ‘gettid’ was here
34 | extern __pid_t gettid (void) __THROW;
| ^~~~~~
make: *** [<builtin>: io_uring-bench.o] Error 1
The problem on Ubuntu 20.04 (with lk 5.9.0-rc5) is that unistd.h
already defines gettid(). So prefix the local definition with
"lk_".
Signed-off-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'tools/io_uring')
-rw-r--r-- | tools/io_uring/io_uring-bench.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/io_uring/io_uring-bench.c b/tools/io_uring/io_uring-bench.c index 0f257139b003..7703f0118385 100644 --- a/tools/io_uring/io_uring-bench.c +++ b/tools/io_uring/io_uring-bench.c @@ -130,7 +130,7 @@ static int io_uring_register_files(struct submitter *s) s->nr_files); } -static int gettid(void) +static int lk_gettid(void) { return syscall(__NR_gettid); } @@ -281,7 +281,7 @@ static void *submitter_fn(void *data) struct io_sq_ring *ring = &s->sq_ring; int ret, prepped; - printf("submitter=%d\n", gettid()); + printf("submitter=%d\n", lk_gettid()); srand48_r(pthread_self(), &s->rand); |