From owner-freebsd-current@FreeBSD.ORG Thu Mar 11 00:38:00 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AB8E1065674 for ; Thu, 11 Mar 2010 00:38:00 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from sarah.protected-networks.net (sarah.protected-networks.net [IPv6:2001:470:1f07:4e1::1]) by mx1.freebsd.org (Postfix) with ESMTP id EA9538FC28 for ; Thu, 11 Mar 2010 00:37:59 +0000 (UTC) Received: from toshi.auburn.protected-networks.net (toshi.auburn.protected-networks.net [202.12.127.84]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "Iain Butler", Issuer "RSA Class 2 Personal CA" (verified OK)) (Authenticated sender: imb) by sarah.protected-networks.net (Postfix) with ESMTPSA id EEB906172 for ; Wed, 10 Mar 2010 19:37:58 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=protected-networks.net; s=200705; t=1268267879; bh=w85ADRCRthNIuSAd7x1p1db9oUK/DHl6lmg4kuYfJ8g=; h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type; b=GyC14FNP3xSdUMfA8qIRvL2hcERi6T01K5DCO9uAzTQzFKTLS8ZejVYdK/fZaU8um eBwTJvQ3K0RYpjbU44mLQps2uQkDWoN7Sy1zs6p1zQhzyuxhfo1KLh/F2E1XS7o DomainKey-Signature: a=rsa-sha1; s=200509; d=protected-networks.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:subject: x-enigmail-version:openpgp:content-type; b=nfB7swucz444uQMyYPvDWOZqgg8wUbmjSjnUiOHmdtwbJeShNKfqzeEp0oq9o1R/j tB9oMRJQtIe3CJVfDqLIhL3qxkjlWA411luW1cH9TGVdJwr1qCB6c/KCyeL6Z2r Message-ID: <4B983B64.1040005@protected-networks.net> Date: Wed, 10 Mar 2010 19:37:56 -0500 From: Michael Butler User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.8) Gecko/20100303 Thunderbird/3.0.3 MIME-Version: 1.0 To: freebsd-current X-Enigmail-Version: 1.0.1 OpenPGP: id=0442D492 Content-Type: multipart/mixed; boundary="------------050008090805050905060806" Subject: sys/dev/siba/siba_core.c fails compilation X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Mar 2010 00:38:00 -0000 This is a multi-part message in MIME format. --------------050008090805050905060806 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 If compiling -current without debugging enabled, this module fails with a warning about unused variables (warnings treated as errors). The attached patch allows compilation to proceed although I'm not convinced that it's entirely correct (duplicate evaluation of device_get_ivars()), imb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkuYO2QACgkQQv9rrgRC1JIuOQCfYzduyb55+itgjs7tLu4Y0EzE u5oAoLu66AManNJuzvHl/B7eBECOVHfB =wo8h -----END PGP SIGNATURE----- --------------050008090805050905060806 Content-Type: text/x-diff; name="siba_core.c.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="siba_core.c.patch" Index: sys/dev/siba/siba_core.c =================================================================== --- sys/dev/siba/siba_core.c (revision 204990) +++ sys/dev/siba/siba_core.c (working copy) @@ -2031,11 +2031,8 @@ uint32_t siba_dma_translation(device_t dev) { - struct siba_dev_softc *sd = device_get_ivars(dev); - struct siba_softc *siba = sd->sd_bus; - - KASSERT(siba->siba_type == SIBA_TYPE_PCI, - ("unsupported bustype %d\n", siba->siba_type)); + KASSERT(device_get_ivars(dev)->sd_bus->siba_type == SIBA_TYPE_PCI, + ("unsupported bustype %d\n", device_get_ivars(dev)->sd_bus->siba_type)); return (SIBA_PCI_DMA); } --------------050008090805050905060806--