Page MenuHomeFreeBSD
Files F102190090

D35276.diff
No OneTemporary
Actions

D35276.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,10 @@
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20220610:
+ LinuxKPI pm.h changes require an update to the latest drm-kmod version
+ before re-compiling to avoid errors.
+
20211230:
The macros provided for the manipulation of CPU sets (e.g. CPU_AND)
have been modified to take 2 source arguments instead of only 1.
diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -597,10 +597,6 @@
#define cpu_has_clflush linux_cpu_has_clflush
#endif
-typedef struct pm_message {
- int event;
-} pm_message_t;
-
/* Swap values of a and b */
#define swap(a, b) do { \
typeof(a) _swap_tmp = a; \
diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -59,6 +59,7 @@
#include <asm/atomic.h>
#include <linux/device.h>
#include <linux/pci_ids.h>
+#include <linux/pm.h>
struct pci_device_id {
uint32_t vendor;
diff --git a/sys/compat/linuxkpi/common/include/linux/pm.h b/sys/compat/linuxkpi/common/include/linux/pm.h
--- a/sys/compat/linuxkpi/common/include/linux/pm.h
+++ b/sys/compat/linuxkpi/common/include/linux/pm.h
@@ -33,6 +33,10 @@
#ifndef _LINUXKPI_LINUX_PM_H
#define _LINUXKPI_LINUX_PM_H
+typedef struct pm_message {
+ int event;
+} pm_message_t;
+
#ifdef CONFIG_PM_SLEEP
#define SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc) \
const struct dev_pm_ops _name = { \
diff --git a/sys/compat/linuxkpi/common/include/linux/usb.h b/sys/compat/linuxkpi/common/include/linux/usb.h
--- a/sys/compat/linuxkpi/common/include/linux/usb.h
+++ b/sys/compat/linuxkpi/common/include/linux/usb.h
@@ -37,12 +37,13 @@
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <linux/pm.h>
+
struct usb_device;
struct usb_interface;
struct usb_driver;
struct urb;
-typedef void *pm_message_t;
typedef void (usb_complete_t)(struct urb *);
#define USB_MAX_FULL_SPEED_ISOC_FRAMES (60 * 1)
diff --git a/sys/compat/linuxkpi/common/src/linux_usb.c b/sys/compat/linuxkpi/common/src/linux_usb.c
--- a/sys/compat/linuxkpi/common/src/linux_usb.c
+++ b/sys/compat/linuxkpi/common/src/linux_usb.c
@@ -339,11 +339,14 @@
{
struct usb_linux_softc *sc = device_get_softc(dev);
struct usb_driver *udrv = usb_linux_get_usb_driver(sc);
+ pm_message_t pm_msg;
int err;
err = 0;
- if (udrv && udrv->suspend)
- err = (udrv->suspend) (sc->sc_ui, 0);
+ if (udrv && udrv->suspend) {
+ pm_msg.event = 0; /* XXX */
+ err = (udrv->suspend) (sc->sc_ui, pm_msg);
+ }
return (-err);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 9, 5:40 PM (21 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14563542
Default Alt Text
D35276.diff (2 KB)

Event Timeline