From nobody Mon Oct 11 17:31:15 2021 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A091417F4708 for ; Mon, 11 Oct 2021 17:31:22 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HSm6y3yGFz4k15 for ; Mon, 11 Oct 2021 17:31:22 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-ot1-x32d.google.com with SMTP id c26-20020a056830349a00b0054d96d25c1eso22553199otu.9 for ; Mon, 11 Oct 2021 10:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=qoJpQ0tFyE4fNcaGrjc5HH3EY1e7Ac1x90L8b2yhliI=; b=FVooVdtPPsQps/y8vHmvEUq6jcjTor+o3wdZXoZhx/uANDhGHFS5j2B8FWciZ779vo LizD/hGTMwpmFuud+dwntSK998HXKCItVc0EoEwNXxw5oHX9FH6UIToZJMuvnDAKGZgE WoQavQPRbE+V95oK8E3SASuh/QnUIVhITU85ZWC1dKrCM5GZmhTW66/8j2EI6JEcodeS jfEFCU2JGOha2BOMK5onFTYDRhoKRZlyQYWqtfY8UOdXFGCi7GTgX45HpnJJhzCZIZv2 89GrkV4/yC3zIS9Fhxfurl1CrPutRW/7ZEBs2EAqI5RNAMUYk34MGK7ACuJiODgOeTUS AVsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=qoJpQ0tFyE4fNcaGrjc5HH3EY1e7Ac1x90L8b2yhliI=; b=7FhptDWgL4UDZE3GMU4wsvBqjXmHsTiYN3ukFHrICAyPoEhm4M2nQq+AYhDi5O75wE fWsmEA1C0ALAL0XCh29Nd7AopsIqwjZlXORDLvWiEUOXmfTq99cmkTwdT0qz+jWOOWlb /gF4RLOIFaPgtDejOFaHLZ9+XjpZLkOpyiUewn8GT75vd7wypMqbVRvwIoTPqFDvh8RA jR6CcFIMQYWPQXddZc/IruANSDjqQjBM/Pen6gbMD1v2J2UcsbvphxevdpL8alNjrW1Z Qi4tGHIk8S4hCuMbs4U7T4G0n+p1sHCBX0QaWHLsI7WPkpMwOU5H+UerctykIseXnP9r dR9w== X-Gm-Message-State: AOAM531tCk1Il53eL6v8Vb2ELiQM/hzyWqWOCiQiTpb/eqv0NnwZYvDP 6rdB7u/UBrO3aNPPEXGWyhnROmejUmDG8r1eBk8A4182 X-Google-Smtp-Source: ABdhPJzoL4/mGLzWlc78HSjF1y26bVEpGfwhE1HnZr7PC4235V2aw5954h/bd0ybvDTkCPryP1uYDIPcxppdcUJyv2o= X-Received: by 2002:a9d:1ab:: with SMTP id e40mr12753013ote.281.1633973475888; Mon, 11 Oct 2021 10:31:15 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:126d:0:b0:3b4:5824:6a18 with HTTP; Mon, 11 Oct 2021 10:31:15 -0700 (PDT) In-Reply-To: References: From: Mateusz Guzik Date: Mon, 11 Oct 2021 19:31:15 +0200 Message-ID: Subject: Re: drm-devel-kmod build failures To: imb@protected-networks.net Cc: freebsd-current Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4HSm6y3yGFz4k15 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N 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 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