aboutsummaryrefslogtreecommitdiff
path: root/modutils/modutils.h
diff options
context:
space:
mode:
Diffstat (limited to 'modutils/modutils.h')
-rw-r--r--modutils/modutils.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/modutils/modutils.h b/modutils/modutils.h
index cc7c65351..0a29ff240 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -27,9 +27,12 @@ int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
27char *filename2modname(const char *filename, char *modname) FAST_FUNC; 27char *filename2modname(const char *filename, char *modname) FAST_FUNC;
28char *parse_cmdline_module_options(char **argv) FAST_FUNC; 28char *parse_cmdline_module_options(char **argv) FAST_FUNC;
29 29
30#define INSMOD_OPTS "vq" USE_FEATURE_2_4_MODULES("sLo:fkx") \ 30#define INSMOD_OPTS \
31 "vq" \
32 USE_FEATURE_2_4_MODULES("sLo:fkx") \
31 USE_FEATURE_INSMOD_LOAD_MAP("m") 33 USE_FEATURE_INSMOD_LOAD_MAP("m")
32#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, &insmod_outputname) 34
35#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, NULL)
33 36
34enum { 37enum {
35 INSMOD_OPT_VERBOSE = 0x0001, 38 INSMOD_OPT_VERBOSE = 0x0001,
@@ -42,13 +45,13 @@ enum {
42 INSMOD_OPT_NO_EXPORT = 0x0080 * ENABLE_FEATURE_2_4_MODULES, 45 INSMOD_OPT_NO_EXPORT = 0x0080 * ENABLE_FEATURE_2_4_MODULES,
43 INSMOD_OPT_PRINT_MAP = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP, 46 INSMOD_OPT_PRINT_MAP = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP,
44#if ENABLE_FEATURE_2_4_MODULES 47#if ENABLE_FEATURE_2_4_MODULES
45#if ENABLE_FEATURE_INSMOD_LOAD_MAP 48# if ENABLE_FEATURE_INSMOD_LOAD_MAP
46 INSMOD_OPT_UNUSED = 0x0200, 49 INSMOD_OPT_UNUSED = 0x0200,
47#else /* ENABLE_FEATURE_INSMOD_LOAD_MAP */ 50# else
48 INSMOD_OPT_UNUSED = 0x0100 51 INSMOD_OPT_UNUSED = 0x0100,
49#endif 52# endif
50#else /* ENABLE_FEATURE_2_4_MODULES */ 53#else
51 INSMOD_OPT_UNUSED = 0x0004 54 INSMOD_OPT_UNUSED = 0x0004,
52#endif 55#endif
53}; 56};
54 57
@@ -56,8 +59,6 @@ int FAST_FUNC bb_init_module(const char *module, const char *options);
56int FAST_FUNC bb_delete_module(const char *module, unsigned int flags); 59int FAST_FUNC bb_delete_module(const char *module, unsigned int flags);
57 60
58#if ENABLE_FEATURE_2_4_MODULES 61#if ENABLE_FEATURE_2_4_MODULES
59extern char *insmod_outputname;
60
61int FAST_FUNC bb_init_module_24(const char *module, const char *options); 62int FAST_FUNC bb_init_module_24(const char *module, const char *options);
62#endif 63#endif
63 64