From nobody Mon Jun 23 22:33:28 2025 X-Original-To: dev-commits-src-main@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 4bR2t11S7Jz5ytJ7; Mon, 23 Jun 2025 22:33:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bR2t059L0z3v7X; Mon, 23 Jun 2025 22:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750718008; 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=4wG5eNsX6Dqm+2WHbkitL1u5SkEc/MhUSuPhf3TbAA8=; b=ucH8xl/pNXnRbIqkRgvwChswSZ4xP+q81GL0OuCzBAhzM3awqdjE51yzXTx0SzQ6PrFAVS dYMq7FkVfqSreAs+hcknf2VdsKDGCDfY4LSqkGxQZrcjt8JQZ8PJ3qVVqr/tX3jPtZZJfx WlpVPBsNNlzl1GublRpiBSCAmbOnfC59s/3rAWd6v9inbyi+LFh30alMB/G466FxSkPRVg QmQydk80wChxvcU3CT8LhbI8tFNe6LdGz9WYBXYyk1Y/RifSXgdnyt0HVD4GS9tzRxaFv2 iCm/Tl+ka+cA12PxpAb6+k9+n40mN2UT1FjQNZrYESKIZlrsCjcL5dtg2NcTHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750718008; 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=4wG5eNsX6Dqm+2WHbkitL1u5SkEc/MhUSuPhf3TbAA8=; b=S+HB48eGyre0HAeUgYCLfmloM61RbfSwEwgTX+gHma03HqHOVr4NYmGAC3XS4BQgz+lGVd Z/4pCG4FZxB4q25+x69hiV37kNcd3Qt/280kREIFAyjOeXALFYaDoE5JPuwopFnkjrUTj0 OA875kjUxP6VtkY3Rju5RaP6RQBnH83VUTxg2s7Di0wYdKy3wtwBFIBXMqrCj1AlTXrSv1 XJwdzK++uv04H4ZVJFAQykaGryXXRI3zBs6NlF8Cuc4PNfegGxK7VdXComVZzCkP/vZtLu 6ZnY+ASTwvJ2+hJe5LSfTzoEDXsupDH60e7tb3T9CB0eY8Azt2qcsMR83LMvPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750718008; a=rsa-sha256; cv=none; b=afR6Lz5KMhRtHy0q+FAEx4ErmSK5F/sL4GSpAmmnBnf0DjbwhfpvYwxtc0BBqELj12jjz/ VZNMvgvQLLcMEC7bJDAmTTenuByvc3hM2UoXvu2rvV4yX2R/KqOTC/5CaaLQsruyHRzwuw GeJnGBfWt6D4BB+6A0ml1Npq+FrWNnAOrACjtPyU1lN++gmYq6EUXpJZs/tcQUQr0FfHj5 hCOhhQbQzNC/LRj8drzeWpGDcnUOtM5SqJVN9qdOWLIUs8iuj4xu9PZeLSJa0Z5crBfUBF SO5z6cyFB9QINXx+k10KoCx4JAPTEMn3sO7IvYN7h6RzdNcKRxcorJb9C2gNDg== 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 4bR2t04gMNz6Jd; Mon, 23 Jun 2025 22:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55NMXSFw047783; Mon, 23 Jun 2025 22:33:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55NMXSao047780; Mon, 23 Jun 2025 22:33:28 GMT (envelope-from git) Date: Mon, 23 Jun 2025 22:33:28 GMT Message-Id: <202506232233.55NMXSao047780@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?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 1609b4d45610 - main - linuxkpi: Add `pm_runtime_get_if_active()` variant from Linux 6.9 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1609b4d456109ac2ec70bd1b38c559f13160f632 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=1609b4d456109ac2ec70bd1b38c559f13160f632 commit 1609b4d456109ac2ec70bd1b38c559f13160f632 Author: Jean-Sébastien Pédron AuthorDate: 2025-06-20 19:06:23 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-06-23 22:16:04 +0000 linuxkpi: Add `pm_runtime_get_if_active()` variant from Linux 6.9 With Linux 6.9, `pm_runtime_get_if_active()` lost its second `bool` argument. This change is put behind a check of `LINUXKPI_VERSION` to keep compatibility. Reviewed by: bz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50991 --- sys/compat/linuxkpi/common/include/linux/pm_runtime.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pm_runtime.h b/sys/compat/linuxkpi/common/include/linux/pm_runtime.h index 616dd508e562..6114b7b159d7 100644 --- a/sys/compat/linuxkpi/common/include/linux/pm_runtime.h +++ b/sys/compat/linuxkpi/common/include/linux/pm_runtime.h @@ -34,8 +34,13 @@ pm_runtime_get_if_in_use(struct device *dev) return 1; } +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION < 60900 static inline int pm_runtime_get_if_active(struct device *dev, bool x) +#else +static inline int +pm_runtime_get_if_active(struct device *dev) +#endif { return 1; }