aboutsummaryrefslogtreecommitdiff
path: root/sys/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/exec.h12
-rw-r--r--sys/sys/module.h8
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 48a4eaf56af4..d8216ca2d585 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)exec.h 8.3 (Berkeley) 1/21/94
- * $Id: exec.h,v 1.21 1998/12/16 16:28:58 bde Exp $
+ * $Id: exec.h,v 1.22 1999/01/29 06:47:53 dillon Exp $
*/
#ifndef _SYS_EXEC_H_
@@ -82,7 +82,15 @@ int exec_register __P((const struct execsw *));
int exec_unregister __P((const struct execsw *));
#ifndef LKM
+
+/*
+ * note: name##_mod cannot be const storage because the
+ * linker_file_sysinit() function modifies _file in the
+ * moduledata_t.
+ */
+
#include <sys/module.h>
+
#define EXEC_SET(name, execsw_arg) \
static int name ## _modevent(module_t mod, int type, void *data) \
{ \
@@ -111,7 +119,7 @@ int exec_unregister __P((const struct execsw *));
name ## _modevent, \
(void *)& execsw_arg \
}; \
- C_DECLARE_MODULE(name, name ## _mod, SI_SUB_EXEC, SI_ORDER_ANY)
+ DECLARE_MODULE(name, name ## _mod, SI_SUB_EXEC, SI_ORDER_ANY)
#endif
#endif
diff --git a/sys/sys/module.h b/sys/sys/module.h
index a5799954147a..05f48c297b27 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: module.h,v 1.8 1999/01/27 21:50:00 dillon Exp $
+ * $Id: module.h,v 1.9 1999/01/29 06:47:53 dillon Exp $
*/
#ifndef _SYS_MODULE_H_
@@ -67,11 +67,7 @@ typedef union modspecific {
SYSINIT(name##module, sub, order, module_register_init, &data) \
struct __hack
-#define C_DECLARE_MODULE(name, data, sub, order) \
- C_SYSINIT(name##module, sub, order, module_register_init, &data) \
- struct __hack
-
-void module_register_init(void *data);
+void module_register_init(const void *data);
int module_register(const char *name, modeventhand_t callback, void *arg,
void *file);
module_t module_lookupbyname(const char *name);