Module Name: src
Committed By: mbalmer
Date: Wed Oct 23 18:57:40 UTC 2013
Modified Files:
src/sbin/modstat: main.c
src/sys/modules/lua: lua.c
src/sys/modules/luacore: luacore.c
src/sys/sys: module.h
Log Message:
use MODULE_CLASS_MISC for Lua modules
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sbin/modstat/main.c
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/lua/lua.c
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/luacore/luacore.c
cvs rdiff -u -r1.33 -r1.34 src/sys/sys/module.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/modstat/main.c
diff -u src/sbin/modstat/main.c:1.17 src/sbin/modstat/main.c:1.18
--- src/sbin/modstat/main.c:1.17 Mon Oct 21 17:14:06 2013
+++ src/sbin/modstat/main.c Wed Oct 23 18:57:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.17 2013/10/21 17:14:06 mbalmer Exp $ */
+/* $NetBSD: main.c,v 1.18 2013/10/23 18:57:40 mbalmer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.17 2013/10/21 17:14:06 mbalmer Exp $");
+__RCSID("$NetBSD: main.c,v 1.18 2013/10/23 18:57:40 mbalmer Exp $");
#endif /* !lint */
#include <sys/module.h>
@@ -54,8 +54,7 @@ static const char *classes[] = {
"vfs",
"driver",
"exec",
- "secmodel",
- "lua"
+ "secmodel"
};
const unsigned int class_max = __arraycount(classes);
Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.2 src/sys/modules/lua/lua.c:1.3
--- src/sys/modules/lua/lua.c:1.2 Fri Oct 18 07:49:06 2013
+++ src/sys/modules/lua/lua.c Wed Oct 23 18:57:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lua.c,v 1.2 2013/10/18 07:49:06 mbalmer Exp $ */
+/* $NetBSD: lua.c,v 1.3 2013/10/23 18:57:40 mbalmer Exp $ */
/*
* Copyright (c) 2011, 2013 by Marc Balmer <[email protected]>.
@@ -478,7 +478,7 @@ lua_require(lua_State *L)
snprintf(name, sizeof name, "lua%s", module);
if (lua_verbose)
device_printf(sc_self, "autoload %s\n", name);
- module_autoload(name, MODULE_CLASS_LUA_BINDING);
+ module_autoload(name, MODULE_CLASS_MISC);
LIST_FOREACH(m, &lua_modules, mod_next)
if (!strcmp(m->mod_name, module)) {
md = m;
Index: src/sys/modules/luacore/luacore.c
diff -u src/sys/modules/luacore/luacore.c:1.3 src/sys/modules/luacore/luacore.c:1.4
--- src/sys/modules/luacore/luacore.c:1.3 Fri Oct 18 07:46:55 2013
+++ src/sys/modules/luacore/luacore.c Wed Oct 23 18:57:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: luacore.c,v 1.3 2013/10/18 07:46:55 mbalmer Exp $ */
+/* $NetBSD: luacore.c,v 1.4 2013/10/23 18:57:40 mbalmer Exp $ */
/*
* Copyright (c) 2011, 2013 Marc Balmer <[email protected]>.
@@ -41,7 +41,7 @@
#include <lua.h>
#ifdef _MODULE
-MODULE(MODULE_CLASS_LUA_BINDING, luacore, "lua");
+MODULE(MODULE_CLASS_MISC, luacore, "lua");
/* Various printing functions */
static int
Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.33 src/sys/sys/module.h:1.34
--- src/sys/sys/module.h:1.33 Mon Oct 21 16:15:44 2013
+++ src/sys/sys/module.h Wed Oct 23 18:57:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: module.h,v 1.33 2013/10/21 16:15:44 mbalmer Exp $ */
+/* $NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,8 +45,7 @@ typedef enum modclass {
MODULE_CLASS_VFS,
MODULE_CLASS_DRIVER,
MODULE_CLASS_EXEC,
- MODULE_CLASS_SECMODEL,
- MODULE_CLASS_LUA_BINDING
+ MODULE_CLASS_SECMODEL
} modclass_t;
/* Module sources: where did it come from? */
