svn commit: r352418 - stable/12/sys/compat/linuxkpi/common/include/linux

[Johannes Lundberg]

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);