From owner-svn-src-all@FreeBSD.ORG Thu Jan 22 15:35:55 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F8ED1065673; Thu, 22 Jan 2009 15:35:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2F9D68FC16; Thu, 22 Jan 2009 15:35:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MFZs12015986; Thu, 22 Jan 2009 15:35:54 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0MFZspe015985; Thu, 22 Jan 2009 15:35:54 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200901221535.n0MFZspe015985@svn.freebsd.org> From: John Baldwin Date: Thu, 22 Jan 2009 15:35:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187591 - head/sys/dev/ppbus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jan 2009 15:35:55 -0000 Author: jhb Date: Thu Jan 22 15:35:54 2009 New Revision: 187591 URL: http://svn.freebsd.org/changeset/base/187591 Log: Fix a compile bogon. 'ppbus' is used by two different sets of debug code in lptout(). Reported by: several Modified: head/sys/dev/ppbus/lpt.c Modified: head/sys/dev/ppbus/lpt.c ============================================================================== --- head/sys/dev/ppbus/lpt.c Thu Jan 22 14:30:35 2009 (r187590) +++ head/sys/dev/ppbus/lpt.c Thu Jan 22 15:35:54 2009 (r187591) @@ -447,7 +447,9 @@ lptout(void *arg) { struct lpt_data *sc = arg; device_t dev = sc->sc_dev; +#if defined(INVARIANTS) || defined(LPT_DEBUG) device_t ppbus = device_get_parent(dev); +#endif ppb_assert_locked(ppbus); lprintf(("T %x ", ppb_rstr(ppbus)));