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 <dumbb...@freebsd.org>
AuthorDate: 2025-06-20 19:06:23 +0000
Commit: Jean-Sébastien Pédron <dumbb...@freebsd.org>
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;
}
