Date: Tue, 14 May 2019 23:50:46 +0000 (UTC) From: Johannes Lundberg <johalun@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347601 - in head/sys: compat/linuxkpi/common/include/linux sys Message-ID: <201905142350.x4ENokjW076371@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: johalun Date: Tue May 14 23:50:46 2019 New Revision: 347601 URL: https://svnweb.freebsd.org/changeset/base/347601 Log: LinuxKPI: Add prepare to pm_ops and bump FreeBSD version. This patch is part of D19565 Reviewed by: hps Approved by: imp (mentor), hps MFC after: 1 week Modified: head/sys/compat/linuxkpi/common/include/linux/device.h head/sys/sys/param.h Modified: head/sys/compat/linuxkpi/common/include/linux/device.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/device.h Tue May 14 23:32:02 2019 (r347600) +++ head/sys/compat/linuxkpi/common/include/linux/device.h Tue May 14 23:50:46 2019 (r347601) @@ -61,6 +61,7 @@ struct class { }; struct dev_pm_ops { + int (*prepare)(struct device *dev); int (*suspend)(struct device *dev); int (*suspend_late)(struct device *dev); int (*resume)(struct device *dev); Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Tue May 14 23:32:02 2019 (r347600) +++ head/sys/sys/param.h Tue May 14 23:50:46 2019 (r347601) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300026 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300027 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905142350.x4ENokjW076371>