From owner-svn-src-all@FreeBSD.ORG  Mon Mar 16 19:25:05 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 16CEAD1D;
 Mon, 16 Mar 2015 19:25:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 022066CD;
 Mon, 16 Mar 2015 19:25:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2GJP4w8086072;
 Mon, 16 Mar 2015 19:25:04 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2GJP4hF086071;
 Mon, 16 Mar 2015 19:25:04 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201503161925.t2GJP4hF086071@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 16 Mar 2015 19:25:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280151 - 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-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Mar 2015 19:25:05 -0000

Author: ian
Date: Mon Mar 16 19:25:03 2015
New Revision: 280151
URL: https://svnweb.freebsd.org/changeset/base/280151

Log:
  

Modified:
  head/sys/kern/kern_et.c

Modified: head/sys/kern/kern_et.c
==============================================================================
--- head/sys/kern/kern_et.c	Mon Mar 16 19:18:45 2015	(r280150)
+++ head/sys/kern/kern_et.c	Mon Mar 16 19:25:03 2015	(r280151)
@@ -243,9 +243,7 @@ sysctl_kern_eventtimer_choice(SYSCTL_HAN
 	struct eventtimer *et;
 	int error;
 
-	if ((error = sysctl_wire_old_buffer(req, 0)) != 0)
-		return (error);
-	sbuf_new_for_sysctl(&sb, NULL, 0, req);
+	sbuf_new(&sb, NULL, 256, SBUF_AUTOEXTEND | SBUF_INCLUDENUL);
 
 	ET_LOCK();
 	SLIST_FOREACH(et, &eventtimers, et_all) {
@@ -256,6 +254,8 @@ sysctl_kern_eventtimer_choice(SYSCTL_HAN
 	ET_UNLOCK();
 
 	error = sbuf_finish(&sb);
+	if (error == 0)
+		error = SYSCTL_OUT(req, sbuf_data(&sb), sbuf_len(&sb));
 	sbuf_delete(&sb);
 	return (error);
 }