diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-24 13:01:12 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-02-17 23:18:03 +0200 |
| commit | b2d74f536e6828d7c394fb09b412bf35af42299d (patch) | |
| tree | 7de4c9809b9463608ab20b16872efb6ef3205f10 | |
| parent | 942d4fcad7a6f23f289e7d2485bc9bc18b4506ab (diff) | |
| download | illumos-joyent-b2d74f536e6828d7c394fb09b412bf35af42299d.tar.gz | |
13539 modload: multiply-defined symbols
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/modload/addrem.h | 18 | ||||
| -rw-r--r-- | usr/src/cmd/modload/drvsubr.c | 9 |
2 files changed, 18 insertions, 9 deletions
diff --git a/usr/src/cmd/modload/addrem.h b/usr/src/cmd/modload/addrem.h index dc2a1732d4..950a7947b7 100644 --- a/usr/src/cmd/modload/addrem.h +++ b/usr/src/cmd/modload/addrem.h @@ -82,16 +82,16 @@ extern "C" { #endif /* pointers to add_drv/rem_drv database files */ -char *driver_aliases; -char *driver_classes; -char *minor_perm; -char *name_to_major; -char *rem_name_to_major; -char *device_policy; -char *extra_privs; +extern char *driver_aliases; +extern char *driver_classes; +extern char *minor_perm; +extern char *name_to_major; +extern char *rem_name_to_major; +extern char *device_policy; +extern char *extra_privs; /* devfs root string */ -char *devfs_root; +extern char *devfs_root; /* module path searching structure */ struct drvmod_dir { @@ -99,7 +99,7 @@ struct drvmod_dir { struct drvmod_dir *next; }; -struct drvmod_dir *moddir; +extern struct drvmod_dir *moddir; /* names of things: directories, commands, files */ #define KERNEL_DRV "/kernel/drv" diff --git a/usr/src/cmd/modload/drvsubr.c b/usr/src/cmd/modload/drvsubr.c index 75662833e9..8337e009d6 100644 --- a/usr/src/cmd/modload/drvsubr.c +++ b/usr/src/cmd/modload/drvsubr.c @@ -66,6 +66,15 @@ */ #define isquote(c) (((c) == '"') || ((c) == '\'')) +char *driver_aliases; +char *driver_classes; +char *device_policy; +char *extra_privs; +char *devfs_root; +char *minor_perm; +struct drvmod_dir *moddir; +char *name_to_major; +char *rem_name_to_major; static char *add_rem_lock; /* lock file */ static int add_rem_lock_fd = -1; |