From owner-svn-src-head@FreeBSD.ORG  Sat Mar  9 20:03:11 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 657B6E7A;
 Sat,  9 Mar 2013 20:03:11 +0000 (UTC)
 (envelope-from davide@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 53E7381B;
 Sat,  9 Mar 2013 20:03:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r29K3B9W089196;
 Sat, 9 Mar 2013 20:03:11 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r29K3BPc089195;
 Sat, 9 Mar 2013 20:03:11 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201303092003.r29K3BPc089195@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Sat, 9 Mar 2013 20:03:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248113 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Mar 2013 20:03:11 -0000

Author: davide
Date: Sat Mar  9 20:03:10 2013
New Revision: 248113
URL: http://svnweb.freebsd.org/changeset/base/248113

Log:
  Fixup r248032:
  Change size requested to malloc(9) now that callwheel buckets are
  callout_list and not callout_tailq anymore. This change was already
  there but it seems it got lost after code churn in r248032.
  
  Reported by:	alc, kib

Modified:
  head/sys/kern/kern_timeout.c

Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c	Sat Mar  9 20:01:35 2013	(r248112)
+++ head/sys/kern/kern_timeout.c	Sat Mar  9 20:03:10 2013	(r248113)
@@ -294,7 +294,7 @@ callout_cpu_init(struct callout_cpu *cc)
 
 	mtx_init(&cc->cc_lock, "callout", NULL, MTX_SPIN | MTX_RECURSE);
 	SLIST_INIT(&cc->cc_callfree);
-	cc->cc_callwheel = malloc(sizeof(struct callout_tailq) * callwheelsize,
+	cc->cc_callwheel = malloc(sizeof(struct callout_list) * callwheelsize,
 	    M_CALLOUT, M_WAITOK);
 	for (i = 0; i < callwheelsize; i++)
 		LIST_INIT(&cc->cc_callwheel[i]);