2008-08-04 17:33:26

by Robert P. J. Day

Subject: [PATCH] KBUILD: Extend "menuconfig" for modules to simplify Kconfig file.

Given that the init/Kconfig file uses a "menuconfig" directive for
modules already, might as well wrap all the submenu entries in an "if"
to toss all those dependencies.

Signed-off-by: Robert P. J. Day <[email protected]>

---

diff --git a/init/Kconfig b/init/Kconfig
index 7e6dae1..b678803 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -845,9 +845,10 @@ menuconfig MODULES

If unsure, say Y.

+if MODULES
+
config MODULE_FORCE_LOAD
bool "Forced module loading"
- depends on MODULES
default n
help
Allow loading of modules without version information (ie. modprobe
@@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD

config MODULE_UNLOAD
bool "Module unloading"
- depends on MODULES
help
Without this option you will not be able to unload any
modules (note that some modules may not be unloadable
@@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD

config MODVERSIONS
bool "Module versioning support"
- depends on MODULES
help
Usually, you have to use modules compiled with your kernel.
Saying Y here makes it sometimes possible to use modules
@@ -886,7 +885,6 @@ config MODVERSIONS

config MODULE_SRCVERSION_ALL
bool "Source checksum for all modules"
- depends on MODULES
help
Modules which contain a MODULE_VERSION get an extra "srcversion"
field inserted into their modinfo section, which contains a
@@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL

config KMOD
def_bool y
- depends on MODULES
help
This is being removed soon. These days, CONFIG_MODULES
implies CONFIG_KMOD, so use that instead.

+endif # MODULES
+
config STOP_MACHINE
bool
default y

========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry:
Have classroom, will lecture.

http://crashcourse.ca Waterloo, Ontario, CANADA
========================================================================

2008-08-04 17:46:52

by Randy Dunlap

Subject: Re: [PATCH] KBUILD: Extend "menuconfig" for modules to simplify Kconfig file.

On Mon, 4 Aug 2008 13:31:32 -0400 (EDT) Robert P. J. Day wrote:

>
> Given that the init/Kconfig file uses a "menuconfig" directive for
> modules already, might as well wrap all the submenu entries in an "if"
> to toss all those dependencies.
>
> Signed-off-by: Robert P. J. Day <[email protected]>

Looks good to me. and tested.

Acked-by: Randy Dunlap <[email protected]>


> ---
>
> diff --git a/init/Kconfig b/init/Kconfig
> index 7e6dae1..b678803 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -845,9 +845,10 @@ menuconfig MODULES
>
> If unsure, say Y.
>
> +if MODULES
> +
> config MODULE_FORCE_LOAD
> bool "Forced module loading"
> - depends on MODULES
> default n
> help
> Allow loading of modules without version information (ie. modprobe
> @@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD
>
> config MODULE_UNLOAD
> bool "Module unloading"
> - depends on MODULES
> help
> Without this option you will not be able to unload any
> modules (note that some modules may not be unloadable
> @@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD
>
> config MODVERSIONS
> bool "Module versioning support"
> - depends on MODULES
> help
> Usually, you have to use modules compiled with your kernel.
> Saying Y here makes it sometimes possible to use modules
> @@ -886,7 +885,6 @@ config MODVERSIONS
>
> config MODULE_SRCVERSION_ALL
> bool "Source checksum for all modules"
> - depends on MODULES
> help
> Modules which contain a MODULE_VERSION get an extra "srcversion"
> field inserted into their modinfo section, which contains a
> @@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL
>
> config KMOD
> def_bool y
> - depends on MODULES
> help
> This is being removed soon. These days, CONFIG_MODULES
> implies CONFIG_KMOD, so use that instead.
>
> +endif # MODULES
> +
> config STOP_MACHINE
> bool
> default y


---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/

2008-08-06 20:16:43

by Sam Ravnborg

Subject: Re: [PATCH] KBUILD: Extend "menuconfig" for modules to simplify Kconfig file.

On Mon, Aug 04, 2008 at 10:45:11AM -0700, Randy Dunlap wrote:
> On Mon, 4 Aug 2008 13:31:32 -0400 (EDT) Robert P. J. Day wrote:
>
> >
> > Given that the init/Kconfig file uses a "menuconfig" directive for
> > modules already, might as well wrap all the submenu entries in an "if"
> > to toss all those dependencies.
> >
> > Signed-off-by: Robert P. J. Day <[email protected]>
>
> Looks good to me. and tested.
>
> Acked-by: Randy Dunlap <[email protected]>

Applied.

Sam