From nobody Thu Feb 16 11:56:19 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 4PHYLt36h1z3q5gV; Thu, 16 Feb 2023 11:56:22 +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 4PHYLr0QNGz49hm; Thu, 16 Feb 2023 11:56:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548580; 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=vK1A/gfumz2r7ebquu/RUAr+pFbwUT+8ctddu0xGHTQ=; b=dVp0vJV8FEBhp+Kot6YaWdLxZsnZgOQCF4r4H4JNQYPl4dQiF1RG9m8wcL1VH7AZ8Kz3Y0 I52YzaqaPhBW8l8tEkV31StAVO8LVladpPqEgbqkSbi1mFoD1QVWdry262rdcTLLL0v5cD 9/G2pC4Yg2ly4HTogBCf7KAU1l/rsxVVBlcA6xcJXGAnXpvWfPCMyXo7WctUAlyXC80fQN qX8iUREzzzmWYBiANmdEu7NBkm8YLXrMVsYmfM/bORIdkjb3nqrGW8JVTcvB6MvjyIWF8e PH2VnBxFkrH4easDDfkqF5BK4weDqSu45SxCo5hKpoQRdlb5CqYUayuIqv1ujg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548580; 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=vK1A/gfumz2r7ebquu/RUAr+pFbwUT+8ctddu0xGHTQ=; b=jUUAkxV/CATUmUJd8rTltYB0dmKL0JPjfiDs9Q2ospSxeI2XJXx0et64d62OWfWMTm/gCS DS9Dgv3w4wfXayVbsYYXjH3Dq58v4AzPoIbvW80h0ZT02P5s3Wgi9iW9xRkpQ6fQzIKoH2 WHQ1axiPHG8nsSY2rzohVjuDzUNTSoQOAv4rMO1SpBGzkhxFUhKFipcmcdYK6JiREmPTvG ueBlNBm7+gKp8VEliUzxnV3mF03/oztKB1iEuhGkkWjdAfBo6V7iZwSo0hxh5oAd+o/5qO j9CIujmZshRpftO1wA/iYJci7OgKT9P8BBh/PYQ+L/dIk7xm/47kpHeJhC1vvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548580; a=rsa-sha256; cv=none; b=VQ+rkqO3jbbGTW1O8EuwDGKYJldOZUCVju2A4t2jYk+jmvRWdF6xoLh8pUTpkiyZyCyS51 hAr8vbyg1NHoTy1owqibyPZs14Njr4Y0oocJVH12jNiYzkG9Hn7+oD7WBGcMxD/wz9xpBE aFViHudlQPqgKjBSeNWaAA4BliEd99EW7g/Atte4Ykkvh1DUOO6LougPg80p4tP7do1UYd 75I8DDLUBkunow/ukLHHQ3wVj4rOVgjD/1tmfDfx8nIaICoKwS+8Qf7oBb18F9pPWRyPcn JZDEBRvhI8gfPHCeik+3cY4GbiDBkhn9uz6jiLmis9oPD6yJFpgYXKzZnyGp/A== 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 4PHYLq3f3Xz13HC; Thu, 16 Feb 2023 11:56:19 +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 31GBuJ1N055951; Thu, 16 Feb 2023 11:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBuJtY055950; Thu, 16 Feb 2023 11:56:19 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:56:19 GMT Message-Id: <202302161156.31GBuJtY055950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: a56ed557f54e - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a56ed557f54ea3216707b1ce4713ea30be1f79f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a56ed557f54ea3216707b1ce4713ea30be1f79f5 commit a56ed557f54ea3216707b1ce4713ea30be1f79f5 Author: Jean-Sébastien Pédron AuthorDate: 2023-01-11 22:22:07 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:18 +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 (cherry picked from commit a83b3ec719eb6c53658656b7b90607564d3c64d3) --- 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_ */