From owner-svn-src-stable@FreeBSD.ORG  Fri Jun 28 03:23:24 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id EB90D775;
 Fri, 28 Jun 2013 03:23:24 +0000 (UTC)
 (envelope-from lstewart@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 DD5641F3D;
 Fri, 28 Jun 2013 03:23:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5S3NOGU090086;
 Fri, 28 Jun 2013 03:23:24 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5S3NOPl090085;
 Fri, 28 Jun 2013 03:23:24 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201306280323.r5S3NOPl090085@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Fri, 28 Jun 2013 03:23:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r252327 - stable/8/sys/sys
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jun 2013 03:23:25 -0000

Author: lstewart
Date: Fri Jun 28 03:23:24 2013
New Revision: 252327
URL: http://svnweb.freebsd.org/changeset/base/252327

Log:
  MFC r251682:
  
  Remove some duplicate code by making KHELP_DECLARE_MOD() a wrapper around
  KHELP_DECLARE_MOD_UMA().

Modified:
  stable/8/sys/sys/module_khelp.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/sys/   (props changed)

Modified: stable/8/sys/sys/module_khelp.h
==============================================================================
--- stable/8/sys/sys/module_khelp.h	Fri Jun 28 03:22:43 2013	(r252326)
+++ stable/8/sys/sys/module_khelp.h	Fri Jun 28 03:23:24 2013	(r252327)
@@ -70,22 +70,6 @@ struct khelp_modevent_data {
 	uma_dtor		umadtor;
 };
 
-#define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\
-	static struct khelp_modevent_data kmd_##hname = {		\
-		.name = #hname,						\
-		.helper = hdata						\
-		.hooks = hhooks,					\
-		.nhooks = sizeof(hhooks) / sizeof(hhooks[0]),		\
-	};								\
-	static moduledata_t h_##hname = {				\
-		.name = #hname,						\
-		.evhand = khelp_modevent,				\
-		.priv = &kmd_##hname					\
-	};								\
-	DECLARE_MODULE(hname, h_##hname, SI_SUB_PROTO_IFATTACHDOMAIN,	\
-	    SI_ORDER_ANY);						\
-	MODULE_VERSION(hname, version)
-
 #define	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, size, ctor, dtor) \
 	static struct khelp_modevent_data kmd_##hname = {		\
 		.name = #hname,						\
@@ -105,6 +89,9 @@ struct khelp_modevent_data {
 	    SI_ORDER_ANY);						\
 	MODULE_VERSION(hname, version)
 
+#define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\
+	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, 0, NULL, NULL)
+
 int	khelp_modevent(module_t mod, int type, void *data);
 
 #endif /* _SYS_MODULE_KHELP_H_ */