From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 17:33:07 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 746C5E7; Sat, 4 Jan 2014 17:33:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 601001208; Sat, 4 Jan 2014 17:33:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04HX7hQ018835; Sat, 4 Jan 2014 17:33:07 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04HX7gP018834; Sat, 4 Jan 2014 17:33:07 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041733.s04HX7gP018834@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 17:33:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260265 - in stable: 10/sys/dev/sk 7/sys/dev/sk 8/sys/dev/sk 9/sys/dev/sk X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:33:07 -0000 Author: dim Date: Sat Jan 4 17:33:05 2014 New Revision: 260265 URL: http://svnweb.freebsd.org/changeset/base/260265 Log: MFC r260016: Remove superfluous old-style rcsid[] from if_sk.c. There is already an __FBSDID() at the top of the file. Modified: stable/7/sys/dev/sk/if_sk.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/sk/if_sk.c stable/8/sys/dev/sk/if_sk.c stable/9/sys/dev/sk/if_sk.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/dev/sk/if_sk.c ============================================================================== --- stable/7/sys/dev/sk/if_sk.c Sat Jan 4 17:27:43 2014 (r260264) +++ stable/7/sys/dev/sk/if_sk.c Sat Jan 4 17:33:05 2014 (r260265) @@ -138,11 +138,6 @@ MODULE_DEPEND(sk, miibus, 1, 1, 1); /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - static struct sk_type sk_devs[] = { { VENDORID_SK, From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 18:48:31 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34B6CB89; Sat, 4 Jan 2014 18:48:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FAC41789; Sat, 4 Jan 2014 18:48:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04ImUTw047756; Sat, 4 Jan 2014 18:48:30 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04ImUZZ047755; Sat, 4 Jan 2014 18:48:30 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041848.s04ImUZZ047755@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:48:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260275 - in stable: 10/sys/dev/en 7/sys/dev/en 8/sys/dev/en 9/sys/dev/en X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:48:31 -0000 Author: dim Date: Sat Jan 4 18:48:29 2014 New Revision: 260275 URL: http://svnweb.freebsd.org/changeset/base/260275 Log: MFC r260038: In sys/dev/en/midway.c, #if 0 an unused static function. Modified: stable/7/sys/dev/en/midway.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/en/midway.c stable/8/sys/dev/en/midway.c stable/9/sys/dev/en/midway.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/dev/en/midway.c ============================================================================== --- stable/7/sys/dev/en/midway.c Sat Jan 4 18:33:28 2014 (r260274) +++ stable/7/sys/dev/en/midway.c Sat Jan 4 18:48:29 2014 (r260275) @@ -341,6 +341,7 @@ en_k2sz(int k) } #define en_log2(X) en_k2sz(X) +#if 0 /* * en_b2sz: convert a DMA burst code to its byte size */ @@ -362,6 +363,7 @@ en_b2sz(int b) } return (0); } +#endif /* * en_sz2b: convert a burst size (bytes) to DMA burst code From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 18:53:33 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4450B2D2; Sat, 4 Jan 2014 18:53:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F438182E; Sat, 4 Jan 2014 18:53:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IrXKI051063; Sat, 4 Jan 2014 18:53:33 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IrXlW051062; Sat, 4 Jan 2014 18:53:33 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041853.s04IrXlW051062@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:53:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260276 - in stable: 10/sys/dev/mcd 7/sys/dev/mcd 8/sys/dev/mcd 9/sys/dev/mcd X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:53:33 -0000 Author: dim Date: Sat Jan 4 18:53:31 2014 New Revision: 260276 URL: http://svnweb.freebsd.org/changeset/base/260276 Log: MFC r260040: In sys/dev/mcd/mcd.c, mark the static const COPYRIGHT string as __used, so it ends up in the object file, and no warnings are emitted about it being actually unused. Modified: stable/7/sys/dev/mcd/mcd.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/mcd/mcd.c stable/8/sys/dev/mcd/mcd.c stable/9/sys/dev/mcd/mcd.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/dev/mcd/mcd.c ============================================================================== --- stable/7/sys/dev/mcd/mcd.c Sat Jan 4 18:48:29 2014 (r260275) +++ stable/7/sys/dev/mcd/mcd.c Sat Jan 4 18:53:31 2014 (r260276) @@ -44,7 +44,7 @@ #include __FBSDID("$FreeBSD$"); -static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; +static const char __used COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include #include From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 18:58:20 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 631DB8A5; Sat, 4 Jan 2014 18:58:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4E601185B; Sat, 4 Jan 2014 18:58:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04IwKGS051759; Sat, 4 Jan 2014 18:58:20 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04IwKwR051758; Sat, 4 Jan 2014 18:58:20 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041858.s04IwKwR051758@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 18:58:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260277 - in stable: 10/sys/dev/my 7/sys/dev/my 8/sys/dev/my 9/sys/dev/my X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 18:58:20 -0000 Author: dim Date: Sat Jan 4 18:58:18 2014 New Revision: 260277 URL: http://svnweb.freebsd.org/changeset/base/260277 Log: MFC r260042: Remove superfluous old-style rcsid[] from if_my.c. There is already an __FBSDID() at the top of the file. Modified: stable/7/sys/dev/my/if_my.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/my/if_my.c stable/8/sys/dev/my/if_my.c stable/9/sys/dev/my/if_my.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/dev/my/if_my.c ============================================================================== --- stable/7/sys/dev/my/if_my.c Sat Jan 4 18:53:31 2014 (r260276) +++ stable/7/sys/dev/my/if_my.c Sat Jan 4 18:58:18 2014 (r260277) @@ -81,11 +81,6 @@ static int MY_USEIOSPACE = 1; #include -#ifndef lint -static const char rcsid[] = -"$Id: if_my.c,v 1.16 2003/04/15 06:37:25 mdodd Exp $"; -#endif - /* * Various supported device vendors/types and their names. */ From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 19:04:56 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB439DA1; Sat, 4 Jan 2014 19:04:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9B60718D9; Sat, 4 Jan 2014 19:04:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04J4uWg055450; Sat, 4 Jan 2014 19:04:56 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04J4uon055448; Sat, 4 Jan 2014 19:04:56 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401041904.s04J4uon055448@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 19:04:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260278 - in stable: 10/sys/netgraph/netflow 7/sys/netgraph/netflow 8/sys/netgraph/netflow 9/sys/netgraph/netflow X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 19:04:56 -0000 Author: dim Date: Sat Jan 4 19:04:53 2014 New Revision: 260278 URL: http://svnweb.freebsd.org/changeset/base/260278 Log: MFC r260048: In sys/netgraph/netflow, use __FBSDID() instead of old-style rcs_id[]. Modified: stable/7/sys/netgraph/netflow/netflow.c stable/7/sys/netgraph/netflow/ng_netflow.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/netgraph/netflow/netflow.c stable/10/sys/netgraph/netflow/netflow_v9.c stable/10/sys/netgraph/netflow/ng_netflow.c stable/8/sys/netgraph/netflow/netflow.c stable/8/sys/netgraph/netflow/netflow_v9.c stable/8/sys/netgraph/netflow/ng_netflow.c stable/9/sys/netgraph/netflow/netflow.c stable/9/sys/netgraph/netflow/netflow_v9.c stable/9/sys/netgraph/netflow/ng_netflow.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/netgraph/netflow/netflow.c ============================================================================== --- stable/7/sys/netgraph/netflow/netflow.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/7/sys/netgraph/netflow/netflow.c Sat Jan 4 19:04:53 2014 (r260278) @@ -27,8 +27,8 @@ * $SourceForge: netflow.c,v 1.41 2004/09/05 11:41:10 glebius Exp $ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include #include Modified: stable/7/sys/netgraph/netflow/ng_netflow.c ============================================================================== --- stable/7/sys/netgraph/netflow/ng_netflow.c Sat Jan 4 18:58:18 2014 (r260277) +++ stable/7/sys/netgraph/netflow/ng_netflow.c Sat Jan 4 19:04:53 2014 (r260278) @@ -27,8 +27,8 @@ * $SourceForge: ng_netflow.c,v 1.30 2004/09/05 11:37:43 glebius Exp $ */ -static const char rcs_id[] = - "@(#) $FreeBSD$"; +#include +__FBSDID("$FreeBSD$"); #include #include From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 21:32:55 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4A9F9D6; Sat, 4 Jan 2014 21:32:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 862B212F4; Sat, 4 Jan 2014 21:32:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04LWtC9012806; Sat, 4 Jan 2014 21:32:55 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LWtjA012805; Sat, 4 Jan 2014 21:32:55 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042132.s04LWtjA012805@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:32:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260287 - in stable: 10/sys/dev/scc 7/sys/dev/scc 8/sys/dev/scc 9/sys/dev/scc X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:32:55 -0000 Author: dim Date: Sat Jan 4 21:32:53 2014 New Revision: 260287 URL: http://svnweb.freebsd.org/changeset/base/260287 Log: MFC r260057: In sys/dev/scc, remove unused static function scc_setmreg(). While here, invoke scc_getmreg() in two more places where it can be used. Reviewed by: marcel Modified: stable/7/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/scc/scc_dev_z8530.c stable/8/sys/dev/scc/scc_dev_z8530.c stable/9/sys/dev/scc/scc_dev_z8530.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/dev/scc/scc_dev_z8530.c ============================================================================== --- stable/7/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:23:49 2014 (r260286) +++ stable/7/sys/dev/scc/scc_dev_z8530.c Sat Jan 4 21:32:53 2014 (r260287) @@ -66,15 +66,6 @@ struct scc_class scc_z8530_class = { }; /* Multiplexed I/O. */ -static __inline void -scc_setmreg(struct scc_bas *bas, int ch, int reg, int val) -{ - - scc_setreg(bas, ch + REG_CTRL, reg); - scc_barrier(bas); - scc_setreg(bas, ch + REG_CTRL, val); -} - static __inline uint8_t scc_getmreg(struct scc_bas *bas, int ch, int reg) { @@ -148,9 +139,7 @@ z8530_bfe_ipend(struct scc_softc *sc) if (ip & IP_TIB) ch[1]->ch_ipend |= SER_INT_TXIDLE; if (ip & IP_SIA) { - scc_setreg(bas, CHAN_A + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_A + REG_CTRL); + bes = scc_getmreg(bas, CHAN_A, CR_RSTXSI); if (bes & BES_BRK) ch[0]->ch_ipend |= SER_INT_BREAK; sig = ch[0]->ch_hwsig; @@ -166,9 +155,7 @@ z8530_bfe_ipend(struct scc_softc *sc) ch[0]->ch_ipend |= SER_INT_OVERRUN; } if (ip & IP_SIB) { - scc_setreg(bas, CHAN_B + REG_CTRL, CR_RSTXSI); - scc_barrier(bas); - bes = scc_getreg(bas, CHAN_B + REG_CTRL); + bes = scc_getmreg(bas, CHAN_B, CR_RSTXSI); if (bes & BES_BRK) ch[1]->ch_ipend |= SER_INT_BREAK; sig = ch[1]->ch_hwsig; From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 21:45:53 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B00082AC; Sat, 4 Jan 2014 21:45:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9B9F613AF; Sat, 4 Jan 2014 21:45:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04Ljr6p016927; Sat, 4 Jan 2014 21:45:53 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04LjrK1016926; Sat, 4 Jan 2014 21:45:53 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042145.s04LjrK1016926@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 21:45:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260289 - in stable: 10/sys/amd64/amd64 7/sys/amd64/amd64 8/sys/amd64/amd64 9/sys/amd64/amd64 X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 21:45:53 -0000 Author: dim Date: Sat Jan 4 21:45:52 2014 New Revision: 260289 URL: http://svnweb.freebsd.org/changeset/base/260289 Log: MFC r260103: In sys/amd64/amd64/pmap.c, remove static function pmap_is_current(), which has been unused since r189415. Reviewed by: alc Modified: stable/7/sys/amd64/amd64/pmap.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/amd64/amd64/pmap.c stable/8/sys/amd64/amd64/pmap.c stable/9/sys/amd64/amd64/pmap.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/amd64/amd64/pmap.c ============================================================================== --- stable/7/sys/amd64/amd64/pmap.c Sat Jan 4 21:38:41 2014 (r260288) +++ stable/7/sys/amd64/amd64/pmap.c Sat Jan 4 21:45:52 2014 (r260289) @@ -1049,16 +1049,6 @@ pmap_invalidate_cache_range(vm_offset_t } /* - * Are we current address space or kernel? - */ -static __inline int -pmap_is_current(pmap_t pmap) -{ - return (pmap == kernel_pmap || - (pmap->pm_pml4[PML4PML4I] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME)); -} - -/* * Routine: pmap_extract * Function: * Extract the physical page address associated From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 22:00:13 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B1E0987; Sat, 4 Jan 2014 22:00:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5BA2A14C3; Sat, 4 Jan 2014 22:00:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04M0Dmn021691; Sat, 4 Jan 2014 22:00:13 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04M0C0e021685; Sat, 4 Jan 2014 22:00:12 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042200.s04M0C0e021685@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 22:00:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260291 - in stable: 10/sys/boot/i386 10/sys/boot/i386/boot2 10/sys/boot/i386/gptboot 10/sys/boot/i386/gptzfsboot 10/sys/boot/i386/zfsboot 10/sys/boot/pc98/boot2 7/sys/boot/i386 7/sys/b... X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 22:00:13 -0000 Author: dim Date: Sat Jan 4 22:00:07 2014 New Revision: 260291 URL: http://svnweb.freebsd.org/changeset/base/260291 Log: MFC r260095: For sys/boot/i386 and sys/boot/pc98, separate flags to be passed directly to the linker (LD_FLAGS) from flags passed indirectly, via the compiler driver (LDFLAGS). This is because several Makefiles under sys/boot/i386 and sys/boot/pc98 use ${LD} directly to link, and the normal LDFLAGS value should not be used in these cases. Modified: stable/7/sys/boot/i386/Makefile.inc stable/7/sys/boot/i386/boot2/Makefile stable/7/sys/boot/i386/gptboot/Makefile stable/7/sys/boot/i386/gptzfsboot/Makefile stable/7/sys/boot/i386/zfsboot/Makefile stable/7/sys/boot/pc98/boot2/Makefile Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/boot/i386/Makefile.inc stable/10/sys/boot/i386/boot2/Makefile stable/10/sys/boot/i386/gptboot/Makefile stable/10/sys/boot/i386/gptzfsboot/Makefile stable/10/sys/boot/i386/zfsboot/Makefile stable/10/sys/boot/pc98/boot2/Makefile stable/8/sys/boot/i386/Makefile.inc stable/8/sys/boot/i386/boot2/Makefile stable/8/sys/boot/i386/gptboot/Makefile stable/8/sys/boot/i386/gptzfsboot/Makefile stable/8/sys/boot/i386/zfsboot/Makefile stable/8/sys/boot/pc98/boot2/Makefile stable/9/sys/boot/i386/Makefile.inc stable/9/sys/boot/i386/boot2/Makefile stable/9/sys/boot/i386/gptboot/Makefile stable/9/sys/boot/i386/gptzfsboot/Makefile stable/9/sys/boot/i386/zfsboot/Makefile stable/9/sys/boot/pc98/boot2/Makefile Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/boot/i386/Makefile.inc ============================================================================== --- stable/7/sys/boot/i386/Makefile.inc Sat Jan 4 21:55:06 2014 (r260290) +++ stable/7/sys/boot/i386/Makefile.inc Sat Jan 4 22:00:07 2014 (r260291) @@ -11,7 +11,8 @@ LDFLAGS+= -nostdlib .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -m32 -march=i386 -LDFLAGS+= -m elf_i386_fbsd +# LD_FLAGS is passed directly to ${LD}, not via ${CC}: +LD_FLAGS+= -m elf_i386_fbsd AFLAGS+= --32 .endif Modified: stable/7/sys/boot/i386/boot2/Makefile ============================================================================== --- stable/7/sys/boot/i386/boot2/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/7/sys/boot/i386/boot2/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -39,7 +39,7 @@ CFLAGS= -Os \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -55,7 +55,7 @@ boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o @@ -76,7 +76,7 @@ boot2.bin: boot2.out objcopy -S -O binary boot2.out ${.TARGET} boot2.out: ${BTXCRT} boot2.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s Modified: stable/7/sys/boot/i386/gptboot/Makefile ============================================================================== --- stable/7/sys/boot/i386/gptboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/7/sys/boot/i386/gptboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -38,7 +38,7 @@ CFLAGS= -Os \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -55,7 +55,7 @@ gptldr.bin: gptldr.out objcopy -S -O binary gptldr.out ${.TARGET} gptldr.out: gptldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o CLEANFILES+= gptboot.bin gptboot.out gptboot.o sio.o @@ -63,7 +63,7 @@ gptboot.bin: gptboot.out objcopy -S -O binary gptboot.out ${.TARGET} gptboot.out: ${BTXCRT} gptboot.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} gptboot.o: ${.CURDIR}/../../common/ufsread.c Modified: stable/7/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- stable/7/sys/boot/i386/gptzfsboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/7/sys/boot/i386/gptzfsboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -35,7 +35,7 @@ CFLAGS= -Os \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -52,7 +52,7 @@ gptldr.bin: gptldr.out objcopy -S -O binary gptldr.out ${.TARGET} gptldr.out: gptldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o CLEANFILES+= gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o @@ -60,7 +60,7 @@ gptzfsboot.bin: gptzfsboot.out objcopy -S -O binary gptzfsboot.out ${.TARGET} gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c Modified: stable/7/sys/boot/i386/zfsboot/Makefile ============================================================================== --- stable/7/sys/boot/i386/zfsboot/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/7/sys/boot/i386/zfsboot/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -38,7 +38,7 @@ CFLAGS= -Os -g \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -54,7 +54,7 @@ zfsboot1: zfsldr.out objcopy -S -O binary zfsldr.out ${.TARGET} zfsldr.out: zfsldr.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o CLEANFILES+= zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \ zfsboot.o zfsboot.s zfsboot.s.tmp zfsboot.h sio.o @@ -80,7 +80,7 @@ zfsboot.bin: zfsboot.out objcopy -S -O binary zfsboot.out ${.TARGET} zfsboot.out: ${BTXCRT} zfsboot.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} zfsboot.o: zfsboot.s Modified: stable/7/sys/boot/pc98/boot2/Makefile ============================================================================== --- stable/7/sys/boot/pc98/boot2/Makefile Sat Jan 4 21:55:06 2014 (r260290) +++ stable/7/sys/boot/pc98/boot2/Makefile Sat Jan 4 22:00:07 2014 (r260291) @@ -44,7 +44,7 @@ CFLAGS= -Os \ # Initialize the bi_bios_geom using the BIOS geometry #CFLAGS+= -DGET_BIOSGEOM -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include @@ -62,7 +62,7 @@ boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o @@ -83,7 +83,7 @@ boot2.bin: boot2.out objcopy -S -O binary boot2.out ${.TARGET} boot2.out: ${BTXCRT} boot2.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s From owner-svn-src-stable-7@FreeBSD.ORG Sat Jan 4 23:12:03 2014 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ADBCF6D9; Sat, 4 Jan 2014 23:12:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7E5DE19A0; Sat, 4 Jan 2014 23:12:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NC3rb051336; Sat, 4 Jan 2014 23:12:03 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NC3FG051335; Sat, 4 Jan 2014 23:12:03 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201401042312.s04NC3FG051335@svn.freebsd.org> From: Dimitry Andric Date: Sat, 4 Jan 2014 23:12:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r260298 - in stable: 10/sys/dev/sound/pci 7/sys/dev/sound/pci 8/sys/dev/sound/pci 9/sys/dev/sound/pci X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:12:03 -0000 Author: dim Date: Sat Jan 4 23:12:01 2014 New Revision: 260298 URL: http://svnweb.freebsd.org/changeset/base/260298 Log: MFC r260112: In sys/dev/sound/pci/maestro.c, #if 0 two unused static functions. Modified: stable/7/sys/dev/sound/pci/maestro.c Directory Properties: stable/7/sys/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/sound/pci/maestro.c stable/8/sys/dev/sound/pci/maestro.c stable/9/sys/dev/sound/pci/maestro.c Directory Properties: stable/10/ (props changed) stable/8/sys/ (props changed) stable/9/sys/ (props changed) Modified: stable/7/sys/dev/sound/pci/maestro.c ============================================================================== --- stable/7/sys/dev/sound/pci/maestro.c Sat Jan 4 23:00:56 2014 (r260297) +++ stable/7/sys/dev/sound/pci/maestro.c Sat Jan 4 23:12:01 2014 (r260298) @@ -205,9 +205,11 @@ SYSCTL_UINT(_debug_maestro, OID_AUTO, po static void agg_sleep(struct agg_info*, const char *wmesg, int msec); +#if 0 static __inline u_int32_t agg_rd(struct agg_info*, int, int size); static __inline void agg_wr(struct agg_info*, int, u_int32_t data, int size); +#endif static int agg_rdcodec(struct agg_info*, int); static int agg_wrcodec(struct agg_info*, int, u_int32_t); @@ -288,6 +290,7 @@ agg_sleep(struct agg_info *sc, const cha /* I/O port */ +#if 0 static __inline u_int32_t agg_rd(struct agg_info *sc, int regno, int size) { @@ -302,12 +305,14 @@ agg_rd(struct agg_info *sc, int regno, i return ~(u_int32_t)0; } } +#endif #define AGG_RD(sc, regno, size) \ bus_space_read_##size( \ ((struct agg_info*)(sc))->st, \ ((struct agg_info*)(sc))->sh, (regno)) +#if 0 static __inline void agg_wr(struct agg_info *sc, int regno, u_int32_t data, int size) { @@ -323,6 +328,7 @@ agg_wr(struct agg_info *sc, int regno, u break; } } +#endif #define AGG_WR(sc, regno, data, size) \ bus_space_write_##size( \