changeset 10780:15da5eb036f9

6875564 assertion failed: un->un_pm_count == 0, file: ../../common/io/scsi/targets/sd.c, line: 9852 (fix xVM boot)
author Shesha Sreenivasamurthy <Shesha.Sreenivasamurthy@Sun.COM>
date Mon, 12 Oct 2009 23:08:28 -0700
parents 784626727024
children 0fe763e73205
files usr/src/uts/i86xpv/Makefile.files usr/src/uts/i86xpv/pcie/Makefile
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/i86xpv/Makefile.files	Mon Oct 12 23:03:07 2009 -0700
+++ b/usr/src/uts/i86xpv/Makefile.files	Mon Oct 12 23:08:28 2009 -0700
@@ -190,7 +190,7 @@
 		    gfxp_devmap.o gfxp_vgatext.o gfxp_vm.o vgasubr.o
 IOAT_OBJS += ioat.o ioat_rs.o ioat_ioctl.o ioat_chan.o
 ISANEXUS_OBJS += isa.o dma_engine.o i8237A.o
-PCI_E_MISC_OBJS += pcie.o pcie_fault.o pcie_acpi.o
+PCIE_MISC_OBJS += pcie_acpi.o pcie_x86.o
 PCI_E_NEXUS_OBJS += npe.o npe_misc.o
 PCI_E_NEXUS_OBJS += pci_common.o pci_kstats.o pci_tools.o
 PCINEXUS_OBJS += pci.o pci_common.o pci_kstats.o pci_tools.o
--- a/usr/src/uts/i86xpv/pcie/Makefile	Mon Oct 12 23:03:07 2009 -0700
+++ b/usr/src/uts/i86xpv/pcie/Makefile	Mon Oct 12 23:08:28 2009 -0700
@@ -39,8 +39,8 @@
 #	Define the module and object file sets.
 #
 MODULE		= pcie
-OBJECTS		= $(PCI_E_MISC_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(PCI_E_MISC_OBJS:%.o=$(LINTS_DIR)/%.ln)
+OBJECTS		= $(PCIE_MISC_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(PCIE_MISC_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_PSM_MISC_DIR)/$(MODULE)
 
 #