module: Remove unused __INIT*_OR_MODULE macros

[PATCH] module: Remove unused __INIT*_OR_MODULE macros

Posted by Petr Pavlu 5 months, 3 weeks ago

Remove the __INIT_OR_MODULE, __INITDATA_OR_MODULE and
__INITRODATA_OR_MODULE macros. These were introduced in commit 8b5a10fc6fd0
("x86: properly annotate alternatives.c"). Only __INITRODATA_OR_MODULE was
ever used, in arch/x86/kernel/alternative.c. In 2011, commit dc326fca2b64
("x86, cpu: Clean up and unify the NOP selection infrastructure") removed
this usage.

Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
---
 include/linux/module.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 3319a5269d28..e9e6eeb042aa 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -151,16 +151,10 @@ extern void cleanup_module(void);
 #define __init_or_module
 #define __initdata_or_module
 #define __initconst_or_module
-#define __INIT_OR_MODULE	.text
-#define __INITDATA_OR_MODULE	.data
-#define __INITRODATA_OR_MODULE	.section ".rodata","a",%progbits
 #else
 #define __init_or_module __init
 #define __initdata_or_module __initdata
 #define __initconst_or_module __initconst
-#define __INIT_OR_MODULE __INIT
-#define __INITDATA_OR_MODULE __INITDATA
-#define __INITRODATA_OR_MODULE __INITRODATA
 #endif /*CONFIG_MODULES*/
 
 struct module_kobject *lookup_or_create_module_kobject(const char *name);

base-commit: be48bcf004f9d0c9207ff21d0edb3b42f253829e
-- 
2.50.1

Re: [PATCH] module: Remove unused __INIT*_OR_MODULE macros

Posted by Sami Tolvanen 1 month, 2 weeks ago

On Tue, 19 Aug 2025 14:13:37 +0200, Petr Pavlu wrote:
> Remove the __INIT_OR_MODULE, __INITDATA_OR_MODULE and
> __INITRODATA_OR_MODULE macros. These were introduced in commit 8b5a10fc6fd0
> ("x86: properly annotate alternatives.c"). Only __INITRODATA_OR_MODULE was
> ever used, in arch/x86/kernel/alternative.c. In 2011, commit dc326fca2b64
> ("x86, cpu: Clean up and unify the NOP selection infrastructure") removed
> this usage.
> 
> [...]

Applied to modules-next, thanks!

[1/1] module: Remove unused __INIT*_OR_MODULE macros
      commit: f13bff1b6d55de341f37a24781df5a1253377db3

Best regards,

	Sami

Re: [PATCH] module: Remove unused __INIT*_OR_MODULE macros

Posted by Aaron Tomlin 3 months, 2 weeks ago

On Tue, Aug 19, 2025 at 02:13:37PM +0200, Petr Pavlu wrote:
> Remove the __INIT_OR_MODULE, __INITDATA_OR_MODULE and
> __INITRODATA_OR_MODULE macros. These were introduced in commit 8b5a10fc6fd0
> ("x86: properly annotate alternatives.c"). Only __INITRODATA_OR_MODULE was
> ever used, in arch/x86/kernel/alternative.c. In 2011, commit dc326fca2b64
> ("x86, cpu: Clean up and unify the NOP selection infrastructure") removed
> this usage.
> 
> Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
> ---
>  include/linux/module.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/include/linux/module.h b/include/linux/module.h
> index 3319a5269d28..e9e6eeb042aa 100644
> --- a/include/linux/module.h
> +++ b/include/linux/module.h
> @@ -151,16 +151,10 @@ extern void cleanup_module(void);
>  #define __init_or_module
>  #define __initdata_or_module
>  #define __initconst_or_module
> -#define __INIT_OR_MODULE	.text
> -#define __INITDATA_OR_MODULE	.data
> -#define __INITRODATA_OR_MODULE	.section ".rodata","a",%progbits
>  #else
>  #define __init_or_module __init
>  #define __initdata_or_module __initdata
>  #define __initconst_or_module __initconst
> -#define __INIT_OR_MODULE __INIT
> -#define __INITDATA_OR_MODULE __INITDATA
> -#define __INITRODATA_OR_MODULE __INITRODATA
>  #endif /*CONFIG_MODULES*/
>  
>  struct module_kobject *lookup_or_create_module_kobject(const char *name);
> 
> base-commit: be48bcf004f9d0c9207ff21d0edb3b42f253829e
> -- 
> 2.50.1
> 
> 

Reviewed-by: Aaron Tomlin <atomlin@atomlin.com>

-- 
Aaron Tomlin

Re: [PATCH] module: Remove unused __INIT*_OR_MODULE macros

Posted by Daniel Gomez 3 months, 2 weeks ago

On 19/08/2025 14.13, Petr Pavlu wrote:
> Remove the __INIT_OR_MODULE, __INITDATA_OR_MODULE and
> __INITRODATA_OR_MODULE macros. These were introduced in commit 8b5a10fc6fd0
> ("x86: properly annotate alternatives.c"). Only __INITRODATA_OR_MODULE was
> ever used, in arch/x86/kernel/alternative.c. In 2011, commit dc326fca2b64
> ("x86, cpu: Clean up and unify the NOP selection infrastructure") removed
> this usage.
> 
> Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>

Reviewed-by: Daniel Gomez <da.gomez@samsung.com>

> ---
>  include/linux/module.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/include/linux/module.h b/include/linux/module.h
> index 3319a5269d28..e9e6eeb042aa 100644
> --- a/include/linux/module.h
> +++ b/include/linux/module.h
> @@ -151,16 +151,10 @@ extern void cleanup_module(void);
>  #define __init_or_module
>  #define __initdata_or_module
>  #define __initconst_or_module
> -#define __INIT_OR_MODULE	.text
> -#define __INITDATA_OR_MODULE	.data
> -#define __INITRODATA_OR_MODULE	.section ".rodata","a",%progbits
>  #else
>  #define __init_or_module __init
>  #define __initdata_or_module __initdata
>  #define __initconst_or_module __initconst
> -#define __INIT_OR_MODULE __INIT
> -#define __INITDATA_OR_MODULE __INITDATA
> -#define __INITRODATA_OR_MODULE __INITRODATA
>  #endif /*CONFIG_MODULES*/
>  
>  struct module_kobject *lookup_or_create_module_kobject(const char *name);
> 
> base-commit: be48bcf004f9d0c9207ff21d0edb3b42f253829e

Re: [PATCH] module: Remove unused __INIT*_OR_MODULE macros

Posted by Sami Tolvanen 5 months, 2 weeks ago

On Tue, Aug 19, 2025 at 5:14 AM Petr Pavlu <petr.pavlu@suse.com> wrote:
>
> Remove the __INIT_OR_MODULE, __INITDATA_OR_MODULE and
> __INITRODATA_OR_MODULE macros. These were introduced in commit 8b5a10fc6fd0
> ("x86: properly annotate alternatives.c"). Only __INITRODATA_OR_MODULE was
> ever used, in arch/x86/kernel/alternative.c. In 2011, commit dc326fca2b64
> ("x86, cpu: Clean up and unify the NOP selection infrastructure") removed
> this usage.
>
> Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>

Reviewed-by: Sami Tolvanen <samitolvanen@google.com>

Sami