diff options
| author | jhb <jhb@FreeBSD.org> | 2006-06-20 20:18:42 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2006-06-20 20:18:42 +0000 |
| commit | eef5a2aec40c3dd5f042fede5cc8566d82c27c0d (patch) | |
| tree | 90246acc6346430cc696ed113ad707698c9137d4 | |
| parent | da7a558f2ecbc1670e062416489b5d6941ad24c5 (diff) | |
| download | FreeBSD-src-eef5a2aec40c3dd5f042fede5cc8566d82c27c0d.zip FreeBSD-src-eef5a2aec40c3dd5f042fede5cc8566d82c27c0d.tar.gz | |
Make linker_file_add_dependency() and linker_load_module() static since
only the linker uses them.
| -rw-r--r-- | sys/kern/kern_linker.c | 12 | ||||
| -rw-r--r-- | sys/sys/linker.h | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index fd824c9..67c45c8 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -109,8 +109,12 @@ struct modlist { typedef struct modlist *modlist_t; static modlisthead_t found_modules; -static modlist_t modlist_lookup2(const char *name, - struct mod_depend *verinfo); +static int linker_file_add_dependency(linker_file_t file, + linker_file_t dep); +static int linker_load_module(const char *kldname, + const char *modname, struct linker_file *parent, + struct mod_depend *verinfo, struct linker_file **lfpp); +static modlist_t modlist_lookup2(const char *name, struct mod_depend *verinfo); static char * linker_strdup(const char *str) @@ -561,7 +565,7 @@ linker_file_unload(linker_file_t file, int flags) return (0); } -int +static int linker_file_add_dependency(linker_file_t file, linker_file_t dep) { linker_file_t *newdeps; @@ -1719,7 +1723,7 @@ linker_hwpmc_list_objects(void) * Find a file which contains given module and load it, if "parent" is not * NULL, register a reference to it. */ -int +static int linker_load_module(const char *kldname, const char *modname, struct linker_file *parent, struct mod_depend *verinfo, struct linker_file **lfpp) diff --git a/sys/sys/linker.h b/sys/sys/linker.h index c112eb4..bfd9804 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -105,13 +105,6 @@ extern linker_file_t linker_kernel_file; int linker_add_class(linker_class_t _cls); /* - * Load a kernel module. - */ -int linker_load_module(const char *_kldname, const char *_modname, - struct linker_file *_parent, struct mod_depend *_verinfo, - struct linker_file **_lfpp); - -/* * Obtain a reference to a module, loading it if required. */ int linker_reference_module(const char* _modname, struct mod_depend *_verinfo, @@ -138,11 +131,6 @@ linker_file_t linker_make_file(const char* _filename, linker_class_t _cls); int linker_file_unload(linker_file_t _file, int flags); /* - * Add a dependency to a file. - */ -int linker_file_add_dependency(linker_file_t _file, linker_file_t _dep); - -/* * Lookup a symbol in a file. If deps is TRUE, look in dependencies * if not found in file. */ |
