2011-06-21 06:12:41

by Stephen Boyd

Subject: [PATCH] configs: Include MODULE_*() when CONFIG_IKCONFIG_PROC=n

If CONFIG_IKCONFIG=m but CONFIG_IKCONFIG_PROC=n we get a module that has
no MODULE_LICENSE definition. Move the MODULE_*() definitions outside
the CONFIG_IKCONFIG_PROC #ifdef to prevent this configuration from
tainting the kernel.

Signed-off-by: Stephen Boyd <[email protected]>
Cc: Randy Dunlap <[email protected]>
---
kernel/configs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/configs.c b/kernel/configs.c
index b4066b4..42e8fa0 100644
--- a/kernel/configs.c
+++ b/kernel/configs.c
@@ -92,8 +92,8 @@ static void __exit ikconfig_cleanup(void)
module_init(ikconfig_init);
module_exit(ikconfig_cleanup);

+#endif /* CONFIG_IKCONFIG_PROC */
+
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Randy Dunlap");
MODULE_DESCRIPTION("Echo the kernel .config file used to build the kernel");
-
-#endif /* CONFIG_IKCONFIG_PROC */
--
1.7.5.rc2.4.g4d8b3

2011-06-21 06:41:54

by Cong Wang

Subject: Re: [PATCH] configs: Include MODULE_*() when CONFIG_IKCONFIG_PROC=n

On Tue, Jun 21, 2011 at 2:12 PM, Stephen Boyd <[email protected]> wrote:
> If CONFIG_IKCONFIG=m but CONFIG_IKCONFIG_PROC=n we get a module that has
> no MODULE_LICENSE definition. Move the MODULE_*() definitions outside
> the CONFIG_IKCONFIG_PROC #ifdef to prevent this configuration from
> tainting the kernel.
>
> Signed-off-by: Stephen Boyd <[email protected]>
> Cc: Randy Dunlap <[email protected]>

Acked-by: WANG Cong <[email protected]>

Thanks.

2011-06-21 14:43:53

by Randy Dunlap

Subject: Re: [PATCH] configs: Include MODULE_*() when CONFIG_IKCONFIG_PROC=n

On Mon, 20 Jun 2011 23:12:27 -0700 Stephen Boyd wrote:

> If CONFIG_IKCONFIG=m but CONFIG_IKCONFIG_PROC=n we get a module that has
> no MODULE_LICENSE definition. Move the MODULE_*() definitions outside
> the CONFIG_IKCONFIG_PROC #ifdef to prevent this configuration from
> tainting the kernel.
>
> Signed-off-by: Stephen Boyd <[email protected]>
> Cc: Randy Dunlap <[email protected]>

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

Thanks.

> ---
> kernel/configs.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/configs.c b/kernel/configs.c
> index b4066b4..42e8fa0 100644
> --- a/kernel/configs.c
> +++ b/kernel/configs.c
> @@ -92,8 +92,8 @@ static void __exit ikconfig_cleanup(void)
> module_init(ikconfig_init);
> module_exit(ikconfig_cleanup);
>
> +#endif /* CONFIG_IKCONFIG_PROC */
> +
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Randy Dunlap");
> MODULE_DESCRIPTION("Echo the kernel .config file used to build the kernel");
> -
> -#endif /* CONFIG_IKCONFIG_PROC */
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***