Date: Fri, 20 Mar 2020 15:07:26 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359165 - in head/sys/compat/linuxkpi/common: include/linux src Message-ID: <202003201507.02KF7QvF029317@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Mar 20 15:07:25 2020 New Revision: 359165 URL: https://svnweb.freebsd.org/changeset/base/359165 Log: Implement a workaround for kms-drm modules pci_iov_if.h was added to pci.h, but none of the kms-drm branches have that. Rather than play whack a mole with the branches, move its inclusion to linux_pci.c which is the only part of the code that needs it now. Longer term, other solutions will be needed, but this gives us time to get those deployed on all the supported versions. Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h head/sys/compat/linuxkpi/common/src/linux_pci.c Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/pci.h Fri Mar 20 15:07:21 2020 (r359164) +++ head/sys/compat/linuxkpi/common/include/linux/pci.h Fri Mar 20 15:07:25 2020 (r359165) @@ -40,10 +40,10 @@ #include <sys/nv.h> #include <sys/pciio.h> #include <sys/rman.h> +#include <sys/bus.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pci_private.h> -#include <dev/pci/pci_iov.h> #include <machine/resource.h> Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_pci.c Fri Mar 20 15:07:21 2020 (r359164) +++ head/sys/compat/linuxkpi/common/src/linux_pci.c Fri Mar 20 15:07:25 2020 (r359165) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filio.h> +#include <sys/pciio.h> #include <sys/pctrie.h> #include <sys/rwlock.h> @@ -45,6 +46,10 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <machine/stdarg.h> + +#include <dev/pci/pcivar.h> +#include <dev/pci/pci_private.h> +#include <dev/pci/pci_iov.h> #include <linux/kobject.h> #include <linux/device.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003201507.02KF7QvF029317>