--- a/usr/src/tools/scripts/nightly.sh	Sun Nov 06 10:46:57 2005 -0800
+++ b/usr/src/tools/scripts/nightly.sh	Sun Nov 06 12:08:54 2005 -0800
@@ -811,7 +811,7 @@
 	-T	do a build with TRACE on
 	-U	update proto area in the parent
 	-V VERS set the build version string to VERS
-	-X	copy x86 IHV packages
+	-X	copy x86 IHV proto area
 	-a	create cpio archives
 	-d	use Distributed Make (default uses Parallel Make)
 	-f	find unreferenced files
@@ -1257,6 +1257,20 @@
 	VERSION=$V_ARG
 fi
 
+#
+# Check for IHV root for copying ihv proto area
+#
+if [ "$X_FLAG" = "y" ]; then
+        if [ "$IA32_IHV_ROOT" = "" ]; then
+		echo "IA32_IHV_ROOT: must be set for copying ihv proto"
+		args_ok=n
+        fi
+        if [ ! -d "$IA32_IHV_ROOT" ]; then
+                echo "$IA32_IHV_ROOT: not found"
+                args_ok=n
+        fi
+fi
+
 # Append source version
 if [ "$SE_FLAG" = "y" ]; then
 	VERSION="${VERSION}:EXPORT"
@@ -1618,6 +1632,14 @@
 	fi
 fi
 
+# copy ihv proto area in addition to the build itself
+
+if [ "$X_FLAG" = "y" ]; then
+
+	# Install IA32 IHV proto area
+	copy_ihv_proto
+fi
+
 echo "==== Build environment ====\n" | tee -a $mail_msg_file >> $LOGFILE
 
 # System

--- a/usr/src/uts/common/os/autoconf.c	Sun Nov 06 10:46:57 2005 -0800
+++ b/usr/src/uts/common/os/autoconf.c	Sun Nov 06 12:08:54 2005 -0800
@@ -383,6 +383,17 @@
 	 * next sibling until the function returns, unlike ddi_walk_devs().
 	 */
 	di_dfs(ddi_root_node(), get_neighbors, 0);
+
+#if !defined(__sparc)
+	/*
+	 * On x86, there is no prom. Create device tree by
+	 * probing pci config space
+	 */
+	{
+		extern void impl_setup_ddi(void);
+		impl_setup_ddi();
+	}
+#endif /* x86 */
 }
 
 /*

--- a/usr/src/uts/i86pc/os/startup.c	Sun Nov 06 10:46:57 2005 -0800
+++ b/usr/src/uts/i86pc/os/startup.c	Sun Nov 06 12:08:54 2005 -0800
@@ -1264,7 +1264,6 @@
 startup_modules(void)
 {
 	unsigned int i;
-	extern void impl_setup_ddi(void);
 	extern void prom_setup(void);
 
 	PRM_POINT("startup_modules() starting...");
@@ -1338,7 +1337,6 @@
 	 * then invoke bus specific code to probe devices.
 	 */
 	setup_ddi();
-	impl_setup_ddi();
 	/*
 	 * Fake a prom tree such that /dev/openprom continues to work
 	 */