From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 32F8843829 for ; Tue, 5 Mar 2024 16:35:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2926242686; Tue, 5 Mar 2024 16:35:14 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1F10742D6A for ; Tue, 5 Mar 2024 16:35:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rGgcDONh7/RxENgrTNojCG5gJqTeUqQoL2Z1Tnp8ugg=; b=S4BrmyRLt7/0zR/JnM4VedPl+cmmkWJy7Cyu0GjvaWJjsIGQsM7cIatY/aB7ja/lYXMaLX CvPEPsfBrrKYOY9A3g/hmcvj7+zk1qGDvKIO8b9ibl7cYWnaLnsU7TwcTVJnNRf6CIHbI+ ydJ3fR4jiGX5LIp68qg101AlooADf2A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-_WiBoTGmPhWBWslGIV6xEQ-1; Tue, 05 Mar 2024 10:35:09 -0500 X-MC-Unique: _WiBoTGmPhWBWslGIV6xEQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 395AD800266; Tue, 5 Mar 2024 15:35:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6178C200AFA2; Tue, 5 Mar 2024 15:35:08 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Daxue Gao , dpdk stable Subject: patch 'kernel/freebsd: fix module build on FreeBSD 14' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:41 +0000 Message-ID: <20240305153449.263666-8-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7f994fccfe7f81d6ac04efc86c3816d76f1f7cfb Thanks. Kevin --- >From 7f994fccfe7f81d6ac04efc86c3816d76f1f7cfb Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 19 Dec 2023 11:29:59 +0000 Subject: [PATCH] kernel/freebsd: fix module build on FreeBSD 14 [ upstream commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 ] When building nic_uio module on FreeBSD 14, a build error is given in the DRIVER_MODULE macro: nic_uio.c:84:81: error: too many arguments provided to function-like macro invocation DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); ^ On FreeBSD 14, the devclass parameter is dropped from the macro, so we conditionally compile a different invocation for BSD versions before/after v14. Bugzilla ID: 1335 Signed-off-by: Bruce Richardson Tested-by: Daxue Gao --- kernel/freebsd/nic_uio/nic_uio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/freebsd/nic_uio/nic_uio.c b/kernel/freebsd/nic_uio/nic_uio.c index 7a81694c92..0043892870 100644 --- a/kernel/freebsd/nic_uio/nic_uio.c +++ b/kernel/freebsd/nic_uio/nic_uio.c @@ -79,8 +79,12 @@ struct pci_bdf { }; -static devclass_t nic_uio_devclass; - DEFINE_CLASS_0(nic_uio, nic_uio_driver, nic_uio_methods, sizeof(struct nic_uio_softc)); + +#if __FreeBSD_version < 1400000 +static devclass_t nic_uio_devclass; DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_devclass, nic_uio_modevent, 0); +#else +DRIVER_MODULE(nic_uio, pci, nic_uio_driver, nic_uio_modevent, 0); +#endif static int -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:54.940538396 +0000 +++ 0008-kernel-freebsd-fix-module-build-on-FreeBSD-14.patch 2024-03-05 14:08:54.619520683 +0000 @@ -1 +1 @@ -From 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 Mon Sep 17 00:00:00 2001 +From 7f994fccfe7f81d6ac04efc86c3816d76f1f7cfb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5eedf66ac0e5ce62cd333e523996c63a3c4c2c00 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org