From owner-svn-src-all@freebsd.org  Wed May  4 06:22:42 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC72CB2CE3B;
 Wed,  4 May 2016 06:22:42 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9602C1FAA;
 Wed,  4 May 2016 06:22:42 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u446MffC058632;
 Wed, 4 May 2016 06:22:41 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u446MftJ058631;
 Wed, 4 May 2016 06:22:41 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201605040622.u446MftJ058631@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 4 May 2016 06:22:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299047 - head/sys/dev/pci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2016 06:22:42 -0000

Author: jkim
Date: Wed May  4 06:22:41 2016
New Revision: 299047
URL: https://svnweb.freebsd.org/changeset/base/299047

Log:
  Fix build without "options PCI_IOV".

Modified:
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Wed May  4 06:09:13 2016	(r299046)
+++ head/sys/dev/pci/pci.c	Wed May  4 06:22:41 2016	(r299047)
@@ -5644,9 +5644,10 @@ pci_cfg_restore(device_t dev, struct pci
 	if (dinfo->cfg.msix.msix_location != 0)
 		pci_resume_msix(dev);
 
+#ifdef PCI_IOV
 	if (dinfo->cfg.iov != NULL)
 		pci_iov_cfg_restore(dev, dinfo);
-
+#endif
 }
 
 static void
@@ -5759,8 +5760,10 @@ pci_cfg_save(device_t dev, struct pci_de
 	if (dinfo->cfg.pcix.pcix_location != 0)
 		pci_cfg_save_pcix(dev, dinfo);
 
+#ifdef PCI_IOV
 	if (dinfo->cfg.iov != NULL)
 		pci_iov_cfg_save(dev, dinfo);
+#endif
 
 	/*
 	 * don't set the state for display devices, base peripherals and