Date: Mon, 16 Sep 2019 18:23:01 +0000 (UTC) From: Johannes Lundberg <johalun@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r352418 - stable/12/sys/compat/linuxkpi/common/include/linux Message-ID: <201909161823.x8GIN15Q089684@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: johalun Date: Mon Sep 16 18:23:01 2019 New Revision: 352418 URL: https://svnweb.freebsd.org/changeset/base/352418 Log: LinuxKPI: Limit exposure of new field in dev_pm_ops to LinuxKPI >= 50000. This will fix a suspend/resume issue that occurs on drm-kmod packages build on 12.0 and run on 12.1. Approved by: imp (mentor) Modified: stable/12/sys/compat/linuxkpi/common/include/linux/device.h Modified: stable/12/sys/compat/linuxkpi/common/include/linux/device.h ============================================================================== --- stable/12/sys/compat/linuxkpi/common/include/linux/device.h Mon Sep 16 16:41:01 2019 (r352417) +++ stable/12/sys/compat/linuxkpi/common/include/linux/device.h Mon Sep 16 18:23:01 2019 (r352418) @@ -60,7 +60,9 @@ struct class { }; struct dev_pm_ops { +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 50000 int (*prepare)(struct device *dev); +#endif int (*suspend)(struct device *dev); int (*suspend_late)(struct device *dev); int (*resume)(struct device *dev);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909161823.x8GIN15Q089684>