Date: Mon, 11 Oct 2021 19:31:15 +0200 From: Mateusz Guzik <mjguzik@gmail.com> To: imb@protected-networks.net Cc: freebsd-current <freebsd-current@freebsd.org> Subject: Re: drm-devel-kmod build failures Message-ID: <CAGudoHHe6nkx5Nq7NC4Uxi32u7dXm5zfxznRXNhCWfrAd2syTQ@mail.gmail.com> In-Reply-To: <e9a238f3-5141-059e-401a-077a109aaa7b@protected-networks.net> References: <e9a238f3-5141-059e-401a-077a109aaa7b@protected-networks.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This should do it (untested):
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 37b268afa..f05de73fa 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -117,9 +117,15 @@ dma_buf_close(struct file *fp, struct thread *td)
return (0);
}
+#if __FreeBSD_version >= 1400037
+static int
+dma_buf_stat(struct file *fp, struct stat *sb,
+ struct ucred *active_cred __unused)
+#else
static int
dma_buf_stat(struct file *fp, struct stat *sb,
struct ucred *active_cred __unused, struct thread *td __unused)
+#endif
{
/* XXX need to define flags for st_mode */
On 10/11/21, Michael Butler via freebsd-current
<freebsd-current@freebsd.org> wrote:
> After the latest freebsd version bump in param.h, I tried to rebuild the
> DRM modules. It failed with ..
>
> --- dma-buf.o ---
> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/drivers/dma-buf//dma-buf.c:121:1:
>
> error: conflicting types for 'dma_buf_stat'
> dma_buf_stat(struct file *fp, struct stat *sb,
> ^
> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/drivers/dma-buf//dma-buf.c:70:18:
>
> note: previous declaration is here
> static fo_stat_t dma_buf_stat;
> ^
> 1 error generated.
> *** [dma-buf.o] Error code 1
>
> make[3]: stopped in
> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/linuxkpi
> 1 error
>
> make[3]: stopped in
> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/linuxkpi
>
> I get a similar error with drm-current-kmod. What changed?
>
> imb
>
>
--
Mateusz Guzik <mjguzik gmail.com>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGudoHHe6nkx5Nq7NC4Uxi32u7dXm5zfxznRXNhCWfrAd2syTQ>