From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 14 20:21:01 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2A77B10656FA;
	Thu, 14 Jun 2012 20:21:00 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F5A48FC16;
	Thu, 14 Jun 2012 20:21:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5EKL06p017062;
	Thu, 14 Jun 2012 20:21:00 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5EKKxk0017060;
	Thu, 14 Jun 2012 20:20:59 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201206142020.q5EKKxk0017060@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Thu, 14 Jun 2012 20:20:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237097 - projects/calloutng/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 14 Jun 2012 20:21:01 -0000

Author: davide
Date: Thu Jun 14 20:20:59 2012
New Revision: 237097
URL: http://svn.freebsd.org/changeset/base/237097

Log:
  callwheelbits variable was introduced long time ago but it's not really used.
  Get rid of it.
  
  Discussed with:		Matt Dillon

Modified:
  projects/calloutng/sys/kern/kern_timeout.c

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Thu Jun 14 20:05:12 2012	(r237096)
+++ projects/calloutng/sys/kern/kern_timeout.c	Thu Jun 14 20:20:59 2012	(r237097)
@@ -81,7 +81,7 @@ SYSCTL_INT(_debug, OID_AUTO, to_avg_mpca
  * TODO:
  *	allocate more timeout table slots when table overflows.
  */
-int callwheelsize, callwheelbits, callwheelmask;
+int callwheelsize, callwheelmask;
 
 /*
  * The callout cpu migration entity represents informations necessary for
@@ -225,10 +225,9 @@ kern_timeout_callwheel_alloc(caddr_t v)
 	/*
 	 * Calculate callout wheel size
 	 */
-	for (callwheelsize = 1, callwheelbits = 0;
-	     callwheelsize < ncallout;
-	     callwheelsize <<= 1, ++callwheelbits)
-		;
+	callwheelsize = 1;
+	while (callwheelsize < ncallout) 
+		callwheelsize <<= 1;
 	callwheelmask = callwheelsize - 1;
 
 	cc->cc_callout = (struct callout *)v;