Merge tag '1_26_2' into w32_1_26_2w32_1_26_2

1 files changed, 17 insertions, 45 deletions

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 51ba42f7a..0fc9ea454 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -7,37 +7,9 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-//config:config MODPROBE_SMALL
-//config:       bool "Simplified modutils"
-//config:       default y
-//config:       select PLATFORM_LINUX
-//config:       help
-//config:         Simplified modutils.
-//config:
-//config:         With this option modprobe does not require modules.dep file
-//config:         and does not use /etc/modules.conf file.
-//config:         It scans module files in /lib/modules/`uname -r` and
-//config:         determines dependencies and module alias names on the fly.
-//config:         This may make module loading slower, most notably
-//config:         when one needs to load module by alias (this requires
-//config:         scanning through module _bodies_).
-//config:
-//config:         At the first attempt to load a module by alias modprobe
-//config:         will try to generate modules.dep.bb file in order to speed up
-//config:         future loads by alias. Failure to do so (read-only /lib/modules,
-//config:         etc) is not reported, and future modprobes will be slow too.
-//config:
-//config:         NB: modules.dep.bb file format is not compatible
-//config:         with modules.dep file as created/used by standard module tools.
-//config:
-//config:         Additional module parameters can be stored in
-//config:         /etc/modules/$module_name files.
-//config:
-//config:         Apart from modprobe, other utilities are also provided:
-//config:         - insmod is an alias to modprobe
-//config:         - rmmod is an alias to modprobe -r
-//config:         - depmod generates modules.dep.bb
-//config:
+
+/* config MODPROBE_SMALL is defined in Config.src to ensure better "make config" order */
+
 //config:config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
 //config:       bool "Accept module options on modprobe command line"
 //config:       default y
@@ -53,11 +25,11 @@
 //config:       help
 //config:         Check if the module is already loaded.
 
-//applet:IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))
+//applet:IF_MODPROBE(IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)))
+//applet:IF_DEPMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod)))
+//applet:IF_INSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod)))
+//applet:IF_LSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod)))
+//applet:IF_RMMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod)))
 
 //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o
 
@@ -67,8 +39,8 @@
 #include <fnmatch.h>
 #include <sys/syscall.h>
 
-extern int init_module(void *module, unsigned long len, const char *options);
-extern int delete_module(const char *module, unsigned flags);
+#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
+#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
 #ifdef __NR_finit_module
 # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
 #endif
@@ -958,7 +930,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;)
 
         /* are we lsmod? -> just dump /proc/modules */
-        if ('l' == applet0) {
+        if (ENABLE_LSMOD && 'l' == applet0) {
                 xprint_and_close_file(xfopen_for_read("/proc/modules"));
                 return EXIT_SUCCESS;
         }
@@ -968,14 +940,14 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         /* Prevent ugly corner cases with no modules at all */
         modinfo = xzalloc(sizeof(modinfo[0]));
 
-        if ('i' != applet0) { /* not insmod */
+        if (!ENABLE_INSMOD || 'i' != applet0) { /* not insmod */
                 /* Goto modules directory */
                 xchdir(CONFIG_DEFAULT_MODULES_DIR);
         }
         uname(&uts); /* never fails */
 
         /* depmod? */
-        if ('d' == applet0) {
+        if (ENABLE_DEPMOD && 'd' == applet0) {
                 /* Supported:
                  * -n: print result to stdout
                  * -a: process all modules (default)
@@ -1014,11 +986,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         argv += optind;
 
         /* are we rmmod? -> simulate modprobe -r */
-        if ('r' == applet0) {
+        if (ENABLE_RMMOD && 'r' == applet0) {
                 option_mask32 |= OPT_r;
         }
 
-        if ('i' != applet0) { /* not insmod */
+        if (!ENABLE_INSMOD || 'i' != applet0) { /* not insmod */
                 /* Goto $VERSION directory */
                 xchdir(uts.release);
         }
@@ -1042,7 +1014,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 argv[1] = NULL;
 #endif
 
-        if ('i' == applet0) { /* insmod */
+        if (ENABLE_INSMOD && 'i' == applet0) { /* insmod */
                 size_t len;
                 void *map;
 
@@ -1062,7 +1034,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* Try to load modprobe.dep.bb */
-        if ('r' != applet0) { /* not rmmod */
+        if (!ENABLE_RMMOD || 'r' != applet0) { /* not rmmod */
                 load_dep_bb();
         }