The branch main has been updated by bz:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5f88df77a6a0c7609700e2f2c35b0dbcb211f1bb

commit 5f88df77a6a0c7609700e2f2c35b0dbcb211f1bb
Author:     Bjoern A. Zeeb <[email protected]>
AuthorDate: 2021-06-18 22:49:12 +0000
Commit:     Bjoern A. Zeeb <[email protected]>
CommitDate: 2021-06-18 22:49:12 +0000

    LinuxKPI: fix build after d4a4960c655  pci: "pcim" (managed) support
    
    Fix a last minute change from d4a4960c6559caa890af0901a21296e75b961210
    based on review feedback in where a function now gets called before
    it is declared which did not fully get merged back to my commit branch.
    
    Noticed by:     CI, jkim
    MFC after:      10 days
    X-MFC with:     d4a4960c6559caa890af0901a21296e75b961210
    Sponsored-by:   The FreeBSD Foundation
---
 sys/compat/linuxkpi/common/src/linux_pci.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c 
b/sys/compat/linuxkpi/common/src/linux_pci.c
index 5711296b6d1f..c35d259a45be 100644
--- a/sys/compat/linuxkpi/common/src/linux_pci.c
+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
@@ -217,6 +217,14 @@ linux_pci_find(device_t dev, const struct pci_device_id 
**idp)
        return (NULL);
 }
 
+static void
+lkpi_pci_dev_release(struct device *dev)
+{
+
+       lkpi_devres_release_free_list(dev);
+       spin_lock_destroy(&dev->devres_lock);
+}
+
 static void
 lkpifill_pci_dev(device_t dev, struct pci_dev *pdev)
 {
@@ -301,14 +309,6 @@ lkpi_pci_get_domain_bus_and_slot(int domain, unsigned int 
bus,
        return (pdev);
 }
 
-static void
-lkpi_pci_dev_release(struct device *dev)
-{
-
-       lkpi_devres_release_free_list(dev);
-       spin_lock_destroy(&dev->devres_lock);
-}
-
 static int
 linux_pci_probe(device_t dev)
 {
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"

Reply via email to