Author: brooks
Date: Tue Nov 20 00:43:14 2018
New Revision: 340657
URL: https://svnweb.freebsd.org/changeset/base/340657

Log:
  MFS r340643:
  
  MFC r340489-r340490
  
  r340489:
  Fix freebsd32 support for PCIOCGETCONF.
  
  This fixes regresssions in pciconf -l and some ports as reported on
  freebsd-current:
  
  https://lists.freebsd.org/pipermail/freebsd-current/2018-November/072144.html
  
  Reported by:  jbeich
  Reviewed by:  kib (also proposed an idential patch)
  Tested by:    jbeich
  Sponsored by: DARPA, AFRL
  Differential Revision:        https://reviews.freebsd.org/D18011
  
  r340490:
  Fix stray tab.
  
  Reported by:  jbeich
  MFC with:     r340489
  Sponsored by: DARPA, AFRL
  Differential Revision:        https://reviews.freebsd.org/D18011
  
  Approved by:  re (gjb)

Modified:
  releng/12.0/sys/dev/pci/pci_user.c
Directory Properties:
  releng/12.0/   (props changed)

Modified: releng/12.0/sys/dev/pci/pci_user.c
==============================================================================
--- releng/12.0/sys/dev/pci/pci_user.c  Tue Nov 20 00:08:33 2018        
(r340656)
+++ releng/12.0/sys/dev/pci/pci_user.c  Tue Nov 20 00:43:14 2018        
(r340657)
@@ -945,6 +945,9 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, 
        if (!(flag & FWRITE)) {
                switch (cmd) {
                case PCIOCGETCONF:
+#ifdef COMPAT_FREEBSD32
+               case PCIOCGETCONF32:
+#endif
 #ifdef PRE7_COMPAT
                case PCIOCGETCONF_OLD:
 #ifdef COMPAT_FREEBSD32
@@ -962,6 +965,9 @@ pci_ioctl(struct cdev *dev, u_long cmd, caddr_t data, 
 
        switch (cmd) {
        case PCIOCGETCONF:
+#ifdef COMPAT_FREEBSD32
+       case PCIOCGETCONF32:
+#endif
 #ifdef PRE7_COMPAT
        case PCIOCGETCONF_OLD:
 #ifdef COMPAT_FREEBSD32
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to