d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix panic when module is compiled in and it is loaded from loader.conf.

Browse Source 
Only panic is fixed, module will be still listed in kldstat(8) output.
Not sure what is correct fix, because adding unloading code in case of
failure to linker_init_kernel_modules() doesn't work.
This commit is contained in:
pjd 2005-05-28 23:20:05 +00:00
parent e9e82d146d
commit 58d2b4c193
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_linker.c
View File

@ -275,7 +275,7 @@ linker_file_register_modules(linker_file_t lf)
{
struct mod_metadata **start, **stop, **mdp;
const moduledata_t *moddata;
int error;
int first_error, error;
KLD_DPF(FILE, ("linker_file_register_modules: registering modules"
" in %s\n", lf->filename));
@ -293,6 +293,7 @@ linker_file_register_modules(linker_file_t lf)
} else
return (0);
}
first_error = 0;
for (mdp = start; mdp < stop; mdp++) {
if ((*mdp)->md_type != MDT_MODULE)
continue;
@ -303,10 +304,11 @@ linker_file_register_modules(linker_file_t lf)
if (error) {
printf("Module %s failed to register: %d\n",
moddata->name, error);
return (error);
if (first_error == 0)
first_error = error;
}
}
return (0);
return (first_error);
}
static void