From b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556 Mon Sep 17 00:00:00 2001 From: Kang-Che Sung Date: Tue, 31 Jan 2017 21:09:17 +0800 Subject: cmdline module options can be disabled on "big" modutils Allow module options on command line to be disabled on "big" modutils. Config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is renamed to FEATURE_CMDLINE_MODULE_OPTIONS and no longer depends on !MODPROBE_SMALL (I'm not sure if disabling this is useful on "big" modutils, but at least the macro can serve as a marker and ensure both implementations of same feature have consistent behavior.) Signed-off-by: Kang-Che Sung Signed-off-by: Denys Vlasenko --- modutils/modutils.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modutils/modutils.c') diff --git a/modutils/modutils.c b/modutils/modutils.c index 4204f06fe..dae623ee4 100644 --- a/modutils/modutils.c +++ b/modutils/modutils.c @@ -120,6 +120,7 @@ char* FAST_FUNC filename2modname(const char *filename, char *modname) return modname; } +#if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces) { char *options; @@ -155,6 +156,7 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces) /* if (optlen != 0) options[optlen-1] = '\0'; */ return options; } +#endif #if ENABLE_FEATURE_INSMOD_TRY_MMAP void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p) -- cgit v1.2.3