From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Douglas Gilbert <dgilbert@interlog.com>,
Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 5.4 15/18] tools/io_uring: fix compile breakage
Date: Mon, 28 Sep 2020 21:31:01 -0400 [thread overview]
Message-ID: <20200929013105.2406634-15-sashal@kernel.org> (raw)
In-Reply-To: <20200929013105.2406634-1-sashal@kernel.org>
From: Douglas Gilbert <dgilbert@interlog.com>
[ Upstream commit 72f04da48a9828ba3ae8ac77bea648bda8b7d0ff ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
tools/io_uring/io_uring-bench.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/io_uring/io_uring-bench.c b/tools/io_uring/io_uring-bench.c
index 0f257139b003e..7703f01183854 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);
--
2.25.1
next prev parent reply other threads:[~2020-09-29 1:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 1:30 [PATCH AUTOSEL 5.4 01/18] clocksource/drivers/timer-gx6605s: Fixup counter reload Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 02/18] libbpf: Remove arch-specific include path in Makefile Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 03/18] drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 04/18] drm/sun4i: mixer: Extend regmap max_register Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 05/18] net: dec: de2104x: Increase receive ring size for Tulip Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 06/18] rndis_host: increase sleep time in the query-response loop Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 07/18] nvme-core: get/put ctrl and transport module in nvme_dev_open/release() Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 08/18] regmap: debugfs: Fix handling of name string for debugfs init delays Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 09/18] fuse: fix the ->direct_IO() treatment of iov_iter Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 10/18] drivers/net/wan/lapbether: Make skb->protocol consistent with the header Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 11/18] drivers/net/wan/hdlc: Set skb->protocol before transmitting Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 12/18] mac80211: Fix radiotap header channel flag for 6GHz band Sasha Levin
2020-09-29 1:30 ` [PATCH AUTOSEL 5.4 13/18] mac80211: do not allow bigger VHT MPDUs than the hardware supports Sasha Levin
2020-09-29 1:31 ` [PATCH AUTOSEL 5.4 14/18] tracing: Make the space reserved for the pid wider Sasha Levin
2020-09-29 1:31 ` Sasha Levin [this message]
2020-09-29 1:31 ` [PATCH AUTOSEL 5.4 16/18] spi: fsl-espi: Only process interrupts for expected events Sasha Levin
2020-09-29 1:31 ` [PATCH AUTOSEL 5.4 17/18] nvme-pci: fix NULL req in completion handler Sasha Levin
2020-09-29 1:31 ` [PATCH AUTOSEL 5.4 18/18] nvme-fc: fail new connections to a deleted host or remote port Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200929013105.2406634-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=dgilbert@interlog.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®