aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 0554def06..348feed8d 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -693,7 +693,6 @@ enum { STRVERSIONLEN = 32 };
693 693
694/*======================================================================*/ 694/*======================================================================*/
695 695
696static unsigned option_mask;
697#define OPTION_STR "sLo:fkvqx" USE_FEATURE_INSMOD_LOAD_MAP("m") 696#define OPTION_STR "sLo:fkvqx" USE_FEATURE_INSMOD_LOAD_MAP("m")
698enum { 697enum {
699 OPT_s = 0x1, // -s /* log to syslog */ 698 OPT_s = 0x1, // -s /* log to syslog */
@@ -713,13 +712,13 @@ enum {
713 OPT_x = 0x80, // -x /* do not export externs */ 712 OPT_x = 0x80, // -x /* do not export externs */
714 OPT_m = 0x100, // -m /* print module load map */ 713 OPT_m = 0x100, // -m /* print module load map */
715}; 714};
716#define flag_force_load (option_mask & OPT_f) 715#define flag_force_load (option_mask32 & OPT_f)
717#define flag_autoclean (option_mask & OPT_k) 716#define flag_autoclean (option_mask32 & OPT_k)
718#define flag_verbose (option_mask & OPT_v) 717#define flag_verbose (option_mask32 & OPT_v)
719#define flag_quiet (option_mask & OPT_q) 718#define flag_quiet (option_mask32 & OPT_q)
720#define flag_noexport (option_mask & OPT_x) 719#define flag_noexport (option_mask32 & OPT_x)
721#ifdef CONFIG_FEATURE_INSMOD_LOAD_MAP 720#ifdef CONFIG_FEATURE_INSMOD_LOAD_MAP
722#define flag_print_load_map (option_mask & OPT_m) 721#define flag_print_load_map (option_mask32 & OPT_m)
723#else 722#else
724#define flag_print_load_map 0 723#define flag_print_load_map 0
725#endif 724#endif
@@ -3983,8 +3982,8 @@ int insmod_main( int argc, char **argv)
3983 struct utsname myuname; 3982 struct utsname myuname;
3984 3983
3985 /* Parse any options */ 3984 /* Parse any options */
3986 option_mask = getopt32(argc, argv, OPTION_STR, &opt_o); 3985 getopt32(argc, argv, OPTION_STR, &opt_o);
3987 if (option_mask & OPT_o) { // -o /* name the output module */ 3986 if (option_mask32 & OPT_o) { // -o /* name the output module */
3988 free(m_name); 3987 free(m_name);
3989 m_name = xstrdup(opt_o); 3988 m_name = xstrdup(opt_o);
3990 } 3989 }