Date: Thu, 11 Mar 2010 08:03:58 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r205003 - head/sys/dev/siba Message-ID: <201003110803.o2B83weK008554@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003110803.o2B83weK008554>