From owner-svn-src-all@FreeBSD.ORG  Sat Jul 16 14:05:35 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 244F1106566B;
	Sat, 16 Jul 2011 14:05:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1441B8FC18;
	Sat, 16 Jul 2011 14:05:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6GE5YwS030689;
	Sat, 16 Jul 2011 14:05:34 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6GE5YP0030686;
	Sat, 16 Jul 2011 14:05:34 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201107161405.p6GE5YP0030686@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 16 Jul 2011 14:05:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224096 - in head/sys/x86: include x86
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jul 2011 14:05:35 -0000

Author: jhb
Date: Sat Jul 16 14:05:34 2011
New Revision: 224096
URL: http://svn.freebsd.org/changeset/base/224096

Log:
  Fix build when NEW_PCIB is not defined.
  
  Submitted by:	gcooper (partially)
  Pointy hat to:	jhb

Modified:
  head/sys/x86/include/mptable.h
  head/sys/x86/x86/mptable.c

Modified: head/sys/x86/include/mptable.h
==============================================================================
--- head/sys/x86/include/mptable.h	Sat Jul 16 12:50:30 2011	(r224095)
+++ head/sys/x86/include/mptable.h	Sat Jul 16 14:05:34 2011	(r224096)
@@ -191,13 +191,15 @@ typedef struct BASETABLE_ENTRY {
 }       basetable_entry;
 
 #ifdef _KERNEL
-#ifdef NEW_PCIB
 struct mptable_hostb_softc {
+#ifdef NEW_PCIB
 	struct pcib_host_resources sc_host_res;
 	int		sc_decodes_vga_io;
 	int		sc_decodes_isa_io;
+#endif
 };
 
+#ifdef NEW_PCIB
 void	mptable_pci_host_res_init(device_t pcib);
 #endif
 int	mptable_pci_probe_table(int bus);

Modified: head/sys/x86/x86/mptable.c
==============================================================================
--- head/sys/x86/x86/mptable.c	Sat Jul 16 12:50:30 2011	(r224095)
+++ head/sys/x86/x86/mptable.c	Sat Jul 16 14:05:34 2011	(r224096)
@@ -192,8 +192,10 @@ static void	mptable_probe_cpus_handler(u
 static void	mptable_register(void *dummy);
 static int	mptable_setup_local(void);
 static int	mptable_setup_io(void);
+#ifdef NEW_PCIB
 static void	mptable_walk_extended_table(
     mptable_extended_entry_handler *handler, void *arg);
+#endif
 static void	mptable_walk_table(mptable_entry_handler *handler, void *arg);
 static int	search_for_sig(u_int32_t target, int count);
 
@@ -437,6 +439,7 @@ mptable_walk_table(mptable_entry_handler
 	}
 }
 
+#ifdef NEW_PCIB
 /*
  * Call the handler routine for each entry in the MP config extended
  * table.
@@ -455,6 +458,7 @@ mptable_walk_extended_table(mptable_exte
 		entry = (ext_entry_ptr)((char *)entry + entry->length);
 	}
 }
+#endif
 
 static void
 mptable_probe_cpus_handler(u_char *entry, void *arg)