Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bernd Kuhls <bernd@kuhls.net>
To: igt-dev@lists.freedesktop.org
Cc: mhmdanas <triallax@tutanota.com>
Subject: [igt-dev] [PATCH 6/7] benchmarks/gem_exec_tracer.c: Fix musl build
Date: Sun, 22 Oct 2023 17:52:25 +0200	[thread overview]
Message-ID: <20231022155226.3484622-7-bernd@kuhls.net> (raw)
In-Reply-To: <20231022155226.3484622-1-bernd@kuhls.net>

From: mhmdanas <triallax@tutanota.com>

Original patch was added to void-linux:
https://github.com/void-linux/void-packages/commit/111918317d06598fe1459dbe139923404f3f4b9d

Bug report with request to split the original patch into some
functional changes:
https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/138

Fixes build error:
../benchmarks/gem_exec_tracer.c:274:1: error: conflicting types for ‘ioctl’; have ‘int(int,  long unsigned int, ...)’
  274 | ioctl(int fd, unsigned long request, ...)

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 benchmarks/gem_exec_tracer.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/benchmarks/gem_exec_tracer.c b/benchmarks/gem_exec_tracer.c
index 7e86473e4..3156dfc23 100644
--- a/benchmarks/gem_exec_tracer.c
+++ b/benchmarks/gem_exec_tracer.c
@@ -271,7 +271,11 @@ static int is_i915(int fd)
 }
 
 int
+#ifdef __GLIBC__
 ioctl(int fd, unsigned long request, ...)
+#else
+ioctl(int fd, int request, ...)
+#endif
 {
 	struct trace *t, **p;
 	va_list args;
-- 
2.39.2

  parent reply	other threads:[~2023-10-22 16:00 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-22 15:52 [igt-dev] [PATCH 0/7] igt: Fix musl build Bernd Kuhls
2023-10-22 15:52 ` [igt-dev] [PATCH 1/7] build: check that outb is present in io.h Bernd Kuhls
2023-10-22 15:52 ` [igt-dev] [PATCH 2/7] Include limits.h to fix build with musl libc Bernd Kuhls
2023-10-24 15:59   ` Kamil Konieczny
2023-10-22 15:52 ` [igt-dev] [PATCH 3/7] lib/igt_aux.h: Fix musl build Bernd Kuhls
2023-10-24 16:16   ` Kamil Konieczny
2023-10-22 15:52 ` [igt-dev] [PATCH 4/7] lib/igt_x86.c: Fix musl/uclibc build Bernd Kuhls
2023-10-22 15:52 ` [igt-dev] [PATCH 5/7] lib/igt_halffloat.c: " Bernd Kuhls
2023-10-22 15:52 ` Bernd Kuhls [this message]
2023-10-24 16:09   ` [igt-dev] [PATCH 6/7] benchmarks/gem_exec_tracer.c: Fix musl build Kamil Konieczny
2023-10-22 15:52 ` [igt-dev] [PATCH 7/7] benchmarks/gem_syslatency.c: " Bernd Kuhls

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=20231022155226.3484622-7-bernd@kuhls.net \
    --to=bernd@kuhls.net \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=triallax@tutanota.com \
    /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