Skip to content

Commit 72f04da

Browse files
doug-gilbertaxboe
authored andcommitted
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>
1 parent f5cac8b commit 72f04da

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

tools/io_uring/io_uring-bench.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static int io_uring_register_files(struct submitter *s)
130130
s->nr_files);
131131
}
132132

133-
static int gettid(void)
133+
static int lk_gettid(void)
134134
{
135135
return syscall(__NR_gettid);
136136
}
@@ -281,7 +281,7 @@ static void *submitter_fn(void *data)
281281
struct io_sq_ring *ring = &s->sq_ring;
282282
int ret, prepped;
283283

284-
printf("submitter=%d\n", gettid());
284+
printf("submitter=%d\n", lk_gettid());
285285

286286
srand48_r(pthread_self(), &s->rand);
287287

0 commit comments

Comments
 (0)