svn commit: r340643 - stable/12/sys/dev/pci

[Brooks Davis]

Author: brooks
Date: Mon Nov 19 18:26:11 2018
New Revision: 340643
URL: https://svnweb.freebsd.org/changeset/base/340643

Log:
  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

Modified:
  stable/12/sys/dev/pci/pci_user.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/pci/pci_user.c
==============================================================================
--- stable/12/sys/dev/pci/pci_user.c	Mon Nov 19 18:24:08 2018	(r340642)
+++ stable/12/sys/dev/pci/pci_user.c	Mon Nov 19 18:26:11 2018	(r340643)
@@ -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