2023-02-24 15:09:14

by Nick Alcock

Subject: [PATCH 06/27] interconnect: remove MODULE_LICENSE in non-modules

Since commit 8b41fc4454e ("kbuild: create modules.builtin without
Makefile.modbuiltin or tristate.conf"), MODULE_LICENSE declarations
are used to identify modules. As a consequence, uses of the macro
in non-modules will cause modprobe to misidentify their containing
object file as a module when it is not (false positives), and modprobe
might succeed rather than failing with a suitable error message.

So remove it in the files in this commit, none of which can be built as
modules.

Signed-off-by: Nick Alcock <[email protected]>
Suggested-by: Luis Chamberlain <[email protected]>
Cc: Luis Chamberlain <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Hitomi Hasegawa <[email protected]>
Cc: Georgi Djakov <[email protected]>
Cc: [email protected]
---
drivers/interconnect/core.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
index 25debded65a8..de61a639fab4 100644
--- a/drivers/interconnect/core.c
+++ b/drivers/interconnect/core.c
@@ -1146,4 +1146,3 @@ device_initcall(icc_init);

MODULE_AUTHOR("Georgi Djakov <[email protected]>");
MODULE_DESCRIPTION("Interconnect Driver Core");
-MODULE_LICENSE("GPL v2");
--
2.39.1.268.g9de2f9a303

2023-03-15 15:23:23

by Georgi Djakov

Subject: Re: [PATCH 06/27] interconnect: remove MODULE_LICENSE in non-modules

Hi Nick,

Thanks for the patch!

On 24.02.23 17:07, Nick Alcock wrote:
> Since commit 8b41fc4454e ("kbuild: create modules.builtin without
> Makefile.modbuiltin or tristate.conf"), MODULE_LICENSE declarations
> are used to identify modules. As a consequence, uses of the macro
> in non-modules will cause modprobe to misidentify their containing
> object file as a module when it is not (false positives), and modprobe
> might succeed rather than failing with a suitable error message.
>
> So remove it in the files in this commit, none of which can be built as
> modules.

I think that it might be better to remove not just the MODULE_LICENCE,
but also the other module related code in this file.

Thanks,
Georgi

>
> Signed-off-by: Nick Alcock <[email protected]>
> Suggested-by: Luis Chamberlain <[email protected]>
> Cc: Luis Chamberlain <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: Hitomi Hasegawa <[email protected]>
> Cc: Georgi Djakov <[email protected]>
> Cc: [email protected]
> ---
> drivers/interconnect/core.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c
> index 25debded65a8..de61a639fab4 100644
> --- a/drivers/interconnect/core.c
> +++ b/drivers/interconnect/core.c
> @@ -1146,4 +1146,3 @@ device_initcall(icc_init);
>
> MODULE_AUTHOR("Georgi Djakov <[email protected]>");
> MODULE_DESCRIPTION("Interconnect Driver Core");
> -MODULE_LICENSE("GPL v2");