From owner-svn-src-projects@FreeBSD.ORG  Fri Jan 18 09:56:51 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F3815EEA;
 Fri, 18 Jan 2013 09:56:50 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E68E0AD5;
 Fri, 18 Jan 2013 09:56:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0I9uotU041721;
 Fri, 18 Jan 2013 09:56:50 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0I9uoe3041720;
 Fri, 18 Jan 2013 09:56:50 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201301180956.r0I9uoe3041720@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 18 Jan 2013 09:56:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245594 - projects/counters/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jan 2013 09:56:51 -0000

Author: kib
Date: Fri Jan 18 09:56:50 2013
New Revision: 245594
URL: http://svnweb.freebsd.org/changeset/base/245594

Log:
  Style

Modified:
  projects/counters/sys/kern/subr_counter.c

Modified: projects/counters/sys/kern/subr_counter.c
==============================================================================
--- projects/counters/sys/kern/subr_counter.c	Fri Jan 18 08:34:50 2013	(r245593)
+++ projects/counters/sys/kern/subr_counter.c	Fri Jan 18 09:56:50 2013	(r245594)
@@ -22,13 +22,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/counter.h>
+#include <sys/kernel.h>
+#include <sys/smp.h>
 #include <vm/uma.h>
  
 static uma_zone_t uint64_pcpu_zone;
@@ -36,8 +38,9 @@ static uma_zone_t uint64_pcpu_zone;
 void
 counter_u64_zero(counter_u64_t c)
 {
+	int i;
 
-	for (int i = 0; i < mp_ncpus; i++)
+	for (i = 0; i < mp_ncpus; i++)
 		*(uint64_t *)((char *)c + sizeof(struct pcpu) * i) = 0;
 }
 
@@ -45,9 +48,10 @@ uint64_t
 counter_u64_fetch(counter_u64_t c)
 {
 	uint64_t r;
+	int i;
 
 	r = 0;
-	for (int i = 0; i < mp_ncpus; i++)
+	for (i = 0; i < mp_ncpus; i++)
 		r += *(uint64_t *)((char *)c + sizeof(struct pcpu) * i);
 
 	return (r);
@@ -59,7 +63,7 @@ counter_u64_alloc(int flags)
 	counter_u64_t r;
 
 	r = uma_zalloc(uint64_pcpu_zone, flags);
-	if (r)
+	if (r != NULL)
 		counter_u64_zero(r);
 
 	return (r);