Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

1 files changed, 3 insertions, 2 deletions

diff --git a/kernel/module.c b/kernel/module.c
index c73b19336f1e..2209ab07e733 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -405,7 +405,8 @@ sys_delete_module(const char *name_user, unsigned int flags)
 		}
 	}
 
-	if (!mod->exit || mod->unsafe) {
+	/* If it has an init func, it must have an exit func to unload */
+	if ((mod->init && !mod->exit) || mod->unsafe) {
 		forced = try_force(flags);
 		if (!forced) {
 			/* This module can't be removed */
@@ -473,7 +474,7 @@ static void print_unload_info(struct seq_file *m, struct module *mod)
 	if (mod->unsafe)
 		seq_printf(m, " [unsafe]");
 
-	if (!mod->exit)
+	if (mod->init && !mod->exit)
 		seq_printf(m, " [permanent]");
 
 	seq_printf(m, "\n");