Author: thompsa
Date: Thu Mar 11 08:03:56 2010
New Revision: 205003
URL: http://svn.freebsd.org/changeset/base/205003
Log:
Revert r204992 and just wrap it all in ifdef INVARIANTS to fix the debug and
non-debug cases.
Modified:
head/sys/dev/siba/siba_core.c
Modified: head/sys/dev/siba/siba_core.c
==============================================================================
--- head/sys/dev/siba/siba_core.c Thu Mar 11 07:46:17 2010
(r205002)
+++ head/sys/dev/siba/siba_core.c Thu Mar 11 08:03:56 2010
(r205003)
@@ -2031,11 +2031,13 @@ siba_pcie_mdio_write(struct siba_pci *sp
uint32_t
siba_dma_translation(device_t dev)
{
+#ifdef INVARIANTS
+ struct siba_dev_softc *sd = device_get_ivars(dev);
+ struct siba_softc *siba = sd->sd_bus;
- KASSERT(device_get_ivars(dev)->sd_bus->siba_type == SIBA_TYPE_PCI,
- ("unsupported bustype %d\n",
- device_get_ivars(dev)->sd_bus->siba_type));
-
+ KASSERT(siba->siba_type == SIBA_TYPE_PCI,
+ ("unsupported bustype %d\n", siba->siba_type));
+#endif
return (SIBA_PCI_DMA);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
