From owner-svn-src-stable-7@FreeBSD.ORG  Fri Mar 25 22:17:25 2011
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3741F106564A;
	Fri, 25 Mar 2011 22:17:25 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 26C138FC08;
	Fri, 25 Mar 2011 22:17:25 +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 p2PMHPM4095257;
	Fri, 25 Mar 2011 22:17:25 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2PMHPQD095255;
	Fri, 25 Mar 2011 22:17:25 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201103252217.p2PMHPQD095255@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Fri, 25 Mar 2011 22:17:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220013 - stable/7/sys/sys
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Mar 2011 22:17:25 -0000

Author: mdf
Date: Fri Mar 25 22:17:24 2011
New Revision: 220013
URL: http://svn.freebsd.org/changeset/base/220013

Log:
  Fix r220012 (MFC of r216060); the KBI of sysctl_oid was *supposed* to be
  preserved, but I was hasty.

Modified:
  stable/7/sys/sys/sysctl.h

Modified: stable/7/sys/sys/sysctl.h
==============================================================================
--- stable/7/sys/sys/sysctl.h	Fri Mar 25 22:11:54 2011	(r220012)
+++ stable/7/sys/sys/sysctl.h	Fri Mar 25 22:17:24 2011	(r220013)
@@ -164,8 +164,8 @@ struct sysctl_oid {
 	const char	*oid_name;
 	int 		(*oid_handler)(SYSCTL_HANDLER_ARGS);
 	const char	*oid_fmt;
-	int		oid_refcnt;
-	u_int		oid_running;
+	int16_t		oid_refcnt;
+	uint16_t	oid_running;
 	const char	*oid_descr;
 };