Date: Thu, 13 Jun 2013 08:07:42 +0000 (UTC) From: Lawrence Stewart <lstewart@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251682 - head/sys/sys Message-ID: <201306130807.r5D87gjj060015@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lstewart Date: Thu Jun 13 08:07:42 2013 New Revision: 251682 URL: http://svnweb.freebsd.org/changeset/base/251682 Log: Remove some duplicate code by making KHELP_DECLARE_MOD() a wrapper around KHELP_DECLARE_MOD_UMA(). MFC after: 3 days Modified: head/sys/sys/module_khelp.h Modified: head/sys/sys/module_khelp.h ============================================================================== --- head/sys/sys/module_khelp.h Thu Jun 13 06:07:19 2013 (r251681) +++ head/sys/sys/module_khelp.h Thu Jun 13 08:07:42 2013 (r251682) @@ -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_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306130807.r5D87gjj060015>