From 26d8b8af6fa0206d07413989ca2a9e3f31dad371 Mon Sep 17 00:00:00 2001 From: Roger Hardiman Date: Mon, 11 Sep 2000 12:23:50 +0000 Subject: Make MOD_UNLOAD return EBUSY to prevent it being unloaded automatically when we unload the bktr driver. Change the sub-section from SI_SUB_PSEDUO to SI_SUB_DRIVERS to make sure the module initialises before the bktr module --- sys/dev/bktr/bktr_mem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c index 5e2c8e85570a5..84fb8794699ef 100644 --- a/sys/dev/bktr/bktr_mem.c +++ b/sys/dev/bktr/bktr_mem.c @@ -87,8 +87,8 @@ bktr_mem_modevent(module_t mod, int type, void *unused){ } case MOD_UNLOAD: { - printf("bktr_mem: memory holder unloaded\n"); - return 0; + printf("bktr_mem: memory holder cannot be unloaded\n"); + return EBUSY; } default: break; @@ -169,6 +169,7 @@ static moduledata_t bktr_mem_mod = { bktr_mem_modevent, 0 }; -/* The load order is First so bktr_mem loads (and initialises) before bktr */ -DECLARE_MODULE(bktr_mem, bktr_mem_mod, SI_SUB_PSEUDO, SI_ORDER_FIRST); +/* The load order is First and module type is Driver to make sure bktr_mem + loads (and initialises) before bktr when both are loaded together */ +DECLARE_MODULE(bktr_mem, bktr_mem_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(bktr_mem, 1); -- cgit v1.3