diff options
| author | trasz <trasz@FreeBSD.org> | 2016-01-11 19:59:56 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2016-01-11 19:59:56 +0000 |
| commit | abb53e398346612c26e98cfc5706888389c0babc (patch) | |
| tree | 2d4c036428f3dc7a2ec96f14b0f35928512b4c30 /sys/kern | |
| parent | cfd269b25d8fdf73c00ba853811d8c603a0c8d82 (diff) | |
| download | FreeBSD-src-abb53e398346612c26e98cfc5706888389c0babc.zip FreeBSD-src-abb53e398346612c26e98cfc5706888389c0babc.tar.gz | |
MFC r289111:
Provide better debug message on kernel module name clash.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_module.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index b769320..479345e 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -158,16 +158,12 @@ module_register(const moduledata_t *data, linker_file_t container) newmod = module_lookupbyname(data->name); if (newmod != NULL) { MOD_XUNLOCK; - printf("module_register: module %s already exists!\n", - data->name); + printf("%s: cannot register %s from %s; already loaded from %s\n", + __func__, data->name, container->filename, newmod->file->filename); return (EEXIST); } namelen = strlen(data->name) + 1; newmod = malloc(sizeof(struct module) + namelen, M_MODULE, M_WAITOK); - if (newmod == NULL) { - MOD_XUNLOCK; - return (ENOMEM); - } newmod->refs = 1; newmod->id = nextid++; newmod->name = (char *)(newmod + 1); |
