From nobody Tue Jan 31 22:44:44 2023 X-Original-To: dev-commits-src-all@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 4P60VN2nCqz3cmbp; Tue, 31 Jan 2023 22:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P60VN2H9kz3xdR; Tue, 31 Jan 2023 22:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675205084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5lT6YAfU4itE9q5UQUm3J9kOrkw5PJLtuAuOS1eq74o=; b=jYGvkzdbp+RQMAxhDk9gwykM/k9yb9UbSIXEHNPcwri2J8UqFTjdpCWKwiZZlNVJHPE173 GlUeWb5C+M1BeibQ5TJT0fRFPwjpLH0WKn+4SeybFRx5IwC1IvUE+3+mf29sV7UX3S+MD9 Y8ovtQgGrMnUNq+EZYuDzs8BrS5qo4VFWhL4w3nr9ARrJYhUIu1h+4Z4K7P8bwLpsvIsRk U+wGnzZ7VuWWacj/RkzxI9bRJ0wdChifo02ju/e6OclpiC4r9ZImz3h/uS8f1xT95l+V1A 4U93avPK5LxxJ4SP8r0uBnVNZcBSyStIh/rLFTJsSxufUpiO9dV1ziu6tiCARg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675205084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5lT6YAfU4itE9q5UQUm3J9kOrkw5PJLtuAuOS1eq74o=; b=clh/Y8n7ASV/dyn38RRFI4y+W9sxw+X2U1Mu2pyrH3Fp+IRSh34MgC1OiMwyY3DkS/Quvf BcqBrpHtWhqsi04hKlW/63aWn1F93HcN/LjoxwWi/I1dClSHyOjx3KpT13G5Xn1Rs4+Mdz RGDSC0AKXApSBwFOp8c0qYyhh+kiyUvcyBalg9dzyMoLlqMrtawOoibqbxJn9cE2svrCBK 5HaIsHvNQ51vMUaZyd3jp89btErf1wqZR0QxjiF6YsFBBoH05oNNnGuxf07bfSo/nDNFDj Z9ji+EPzOC6724xcu3+m5eAIiAF15dlfgeMCATgYLXt3iMcp+by4/bZxcgIUig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675205084; a=rsa-sha256; cv=none; b=IAI+PtErta5FXd6vrR8WQ4/KFqL/16nkiNuL6ipHDnY+kr326hDlXvnGWl0wBJHmujPJ0o DxCvL53Kxnc3PPM2KxcEzabVy3Wi/bWf3QCG+fpUZ0Si28DS859D9oMW1U/qD9m/eBmm5P 6wuh1523QOf15Vt4zPSXQnkOkUUC+IPQV/1mVAllR1MZacOTexHjGGaHubBx2F3CfmMxi3 SCLnrHDGxhmlxufcQfBmO3CsfF3WzfSMg12n7JTslFt74+F3lgFlRCV0EJqP9+4DxbaGuQ RArxJ2QKwQQNY1DgciJ2OZOURvMdxxeFxcf12dM0hmn0Iuo0eO1imEsCTd7Pkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P60VN1Bg9z16DP; Tue, 31 Jan 2023 22:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30VMiiQY052082; Tue, 31 Jan 2023 22:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VMiiuF052081; Tue, 31 Jan 2023 22:44:44 GMT (envelope-from git) Date: Tue, 31 Jan 2023 22:44:44 GMT Message-Id: <202301312244.30VMiiuF052081@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: a83b3ec719eb - main - linuxkpi: list_sort()'s callback now takes list arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a83b3ec719eb6c53658656b7b90607564d3c64d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a83b3ec719eb6c53658656b7b90607564d3c64d3 commit a83b3ec719eb6c53658656b7b90607564d3c64d3 Author: Jean-Sébastien Pédron AuthorDate: 2023-01-11 22:22:07 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-01-31 22:36:33 +0000 linuxkpi: list_sort()'s callback now takes list arguments This change breaks the API of `list_sort()`. `LINUXKPI_VERSION >= 51300` is used to keep the header compatible with both versions of the prototype. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38082 --- sys/compat/linuxkpi/common/include/linux/list.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index 80ac57fecf6d..6ec715291807 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -504,7 +504,12 @@ static inline int list_is_last(const struct list_head *list, (pos) && ({ n = (pos)->member.next; 1; }); \ pos = hlist_entry_safe(n, typeof(*(pos)), member)) +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51300 +extern void list_sort(void *priv, struct list_head *head, int (*cmp)(void *priv, + const struct list_head *a, const struct list_head *b)); +#else extern void list_sort(void *priv, struct list_head *head, int (*cmp)(void *priv, struct list_head *a, struct list_head *b)); +#endif #endif /* _LINUXKPI_LINUX_LIST_H_ */