mac80211: add a pending patch to remove the dependency on ecb

[openwrt.git] / package / busybox / config / modutils / Config.in

diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in
index e2f880f..ad5401f 100644 (file)
--- a/package/busybox/config/modutils/Config.in
+++ b/package/busybox/config/modutils/Config.in
@@ -5,6 +5,12 @@
 
 menu "Linux Module Utilities"
 
+config BUSYBOX_CONFIG_MODINFO
+       bool "modinfo"
+       default n
+       help
+         Show information about a Linux Kernel module
+
 config BUSYBOX_CONFIG_MODPROBE_SMALL
        bool "Simplified modutils"
        default n
@@ -90,12 +96,8 @@ config BUSYBOX_CONFIG_MODPROBE
          Handle the loading of modules, and their dependencies on a high
          level.
 
-         Note that in the state, modprobe does not understand multiple
-         module options from the configuration file. See option below.
-
 config BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST
-       bool
-       prompt "Blacklist support"
+       bool "Blacklist support"
        default n
        depends on BUSYBOX_CONFIG_MODPROBE
        help
@@ -125,6 +127,22 @@ config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
          This increases size considerably. Say N unless you plan
          to run ancient kernels.
 
+config BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP
+       bool "Try to load module from a mmap'ed area"
+       default n
+       depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE_SMALL
+       help
+         This option causes module loading code to try to mmap
+         module first. If it does not work (for example,
+         it does not work for compressed modules), module will be read
+         (and unpacked if needed) into a memory block allocated by malloc.
+
+         The only case when mmap works but malloc does not is when
+         you are trying to load a big module on a very memory-constrained
+         machine. Malloc will momentarily need 2x as much memory as mmap.
+
+         Choosing N saves about 250 bytes of code (on 32-bit x86).
+
 config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING
        bool "Enable module version checking"
        default n
@@ -214,7 +232,7 @@ config BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS
 config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR
        string "Default directory containing modules"
        default "/lib/modules"
-       depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL
+       depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL || BUSYBOX_CONFIG_MODINFO
        help
          Directory that contains kernel modules.
          Defaults to "/lib/modules"
@@ -222,7 +240,7 @@ config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR
 config BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE
        string "Default name of modules.dep"
        default "modules.dep"
-       depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL
+       depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL || BUSYBOX_CONFIG_MODINFO
        help
          Filename that contains kernel modules dependencies.
          Defaults to "modules.dep"