Commit c68472b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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()
parents 6855f060 44a375e8

arch/arm/kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -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;