From owner-svn-src-head@FreeBSD.ORG  Tue Sep 14 10:26:49 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 680A4106567A;
	Tue, 14 Sep 2010 10:26:49 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 57B2B8FC16;
	Tue, 14 Sep 2010 10:26:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8EAQnYA075616;
	Tue, 14 Sep 2010 10:26:49 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8EAQnrN075614;
	Tue, 14 Sep 2010 10:26:49 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201009141026.o8EAQnrN075614@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 14 Sep 2010 10:26:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212604 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 14 Sep 2010 10:26:49 -0000

Author: mav
Date: Tue Sep 14 10:26:49 2010
New Revision: 212604
URL: http://svn.freebsd.org/changeset/base/212604

Log:
  Fix panic on NULL dereference possible after r212541.

Modified:
  head/sys/kern/kern_timeout.c

Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c	Tue Sep 14 08:48:06 2010	(r212603)
+++ head/sys/kern/kern_timeout.c	Tue Sep 14 10:26:49 2010	(r212604)
@@ -672,7 +672,8 @@ retry:
 	c->c_time = ticks + to_ticks;
 	TAILQ_INSERT_TAIL(&cc->cc_callwheel[c->c_time & callwheelmask], 
 			  c, c_links.tqe);
-	if ((c->c_time - cc->cc_firsttick) < 0) {
+	if ((c->c_time - cc->cc_firsttick) < 0 &&
+	    callout_new_inserted != NULL) {
 		cc->cc_firsttick = c->c_time;
 		(*callout_new_inserted)(cpu,
 		    to_ticks + (ticks - cc->cc_ticks));