4f65360a5
Rob Landley
2005-05-04
Subject
Tweak the "pretty lsmod for 2.6" patch to be seperately selectable.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/Config.in+12 -4
| @@ -18,6 +18,13 @@ config CONFIG_FEATURE_2_4_MODULES | |
| help | |
| Support module loading for 2.2.x and 2.4.x Linux kernels. | |
| + | config CONFIG_FEATURE_2_6_MODULES |
| + | bool " Support version 2.6.x Linux kernels" |
| + | default n |
| + | depends on CONFIG_INSMOD |
| + | help |
| + | Support module loading for newer 2.6.x Linux kernels. |
| + | |
| config CONFIG_FEATURE_INSMOD_VERSION_CHECKING | |
| bool " Module version checking" | |
| default n | |
| @@ -73,12 +80,13 @@ config CONFIG_LSMOD | |
| help | |
| lsmod is used to display a list of loaded modules. | |
| - | config CONFIG_FEATURE_2_6_MODULES |
| - | bool " Support version 2.6.x Linux kernels" |
| + | config CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT |
| + | bool " lsmod pretty output for 2.6.x Linux kernels " |
| default n | |
| - | depends on CONFIG_INSMOD || CONFIG_LSMOD |
| + | depends on CONFIG_LSMOD |
| help | |
| - | Support module loading for newer 2.6.x Linux kernels. |
| + | This option makes output format of lsmod adjusted to |
| + | the format of module-init-tools for Linux kernel 2.6. |
| config CONFIG_FEATURE_QUERY_MODULE_INTERFACE | |
| bool | |
modutils/lsmod.c+2 -1
| @@ -164,7 +164,7 @@ extern int lsmod_main(int argc, char **argv) | |
| { | |
| printf("Module Size Used by"); | |
| check_tainted(); | |
| - | #if defined(CONFIG_FEATURE_2_6_MODULES) |
| + | #if defined(CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT) |
| { | |
| FILE *file; | |
| char line[4096]; | |
| @@ -204,6 +204,7 @@ extern int lsmod_main(int argc, char **argv) | |
| } | |
| fclose(file); | |
| } | |
| + | return 0; /* Success */ |
| #else | |
| if (bb_xprint_file_by_name("/proc/modules") < 0) { | |
| return 0; | |