Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux

torvalds · torvalds · commit c68472b46416 · 2025-09-28T13:24:43.000-07:00
Pull ARM fix from Russell King:
 "Just one fix to the module freeing function that was declared __weak
  when it should not have been. Thanks to Petr Pavlu for spotting this"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9458/1: module: Ensure the override of module_arch_freeing_init()
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
@@ -484,7 +484,7 @@ module_arch_cleanup(struct module *mod)
 #endif
 }
 
-void __weak module_arch_freeing_init(struct module *mod)
+void module_arch_freeing_init(struct module *mod)
 {
 #ifdef CONFIG_ARM_UNWIND
 	struct unwind_table *init = mod->arch.init_table;

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ module_arch_cleanup(struct module *mod)`
`484`	`484`	`#endif`
`485`	`485`	`}`
`486`	`486`
`487`		`-void __weak module_arch_freeing_init(struct module *mod)`
	`487`	`+void module_arch_freeing_init(struct module *mod)`
`488`	`488`	`{`
`489`	`489`	`#ifdef CONFIG_ARM_UNWIND`
`490`	`490`	`struct unwind_table *init = mod->arch.init_table;`