From owner-svn-src-head@FreeBSD.ORG  Sun Mar 10 22:18:13 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5D9315D6
 for <svn-src-head@freebsd.org>; Sun, 10 Mar 2013 22:18:13 +0000 (UTC)
 (envelope-from andre@freebsd.org)
Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2])
 by mx1.freebsd.org (Postfix) with ESMTP id BBD8C30B
 for <svn-src-head@freebsd.org>; Sun, 10 Mar 2013 22:18:12 +0000 (UTC)
Received: (qmail 97337 invoked from network); 10 Mar 2013 23:31:03 -0000
Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2])
 (envelope-sender <andre@freebsd.org>)
 by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP
 for <davide@FreeBSD.org>; 10 Mar 2013 23:31:03 -0000
Message-ID: <513D06A3.6090304@freebsd.org>
Date: Sun, 10 Mar 2013 23:18:11 +0100
From: Andre Oppermann <andre@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/20130107 Thunderbird/17.0.2
MIME-Version: 1.0
To: Davide Italiano <davide@FreeBSD.org>
Subject: Re: svn commit: r248113 - head/sys/kern
References: <201303092003.r29K3BPc089195@svn.freebsd.org>
In-Reply-To: <201303092003.r29K3BPc089195@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
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: Sun, 10 Mar 2013 22:18:13 -0000

On 09.03.2013 21:03, Davide Italiano wrote:
> 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.

Sorry, I have missed this change while forward-porting the patch.
The (light) testing of the kernel didn't blow up.  Actually I did
the commit from it.  :-/

-- 
Andre

>    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]);
>
>