Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ce621e1 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Michael Ellerman
Browse files

powerpc/modules: remove unused mod_arch_specific.toc field 



The toc field in the mod_arch_specific struct isn't actually used
anywhere, so remove it.

Also the ftrace-specific fields are now common between 32-bit and
64-bit, so simplify the struct definition a bit by moving them out of
the __powerpc64__ #ifdef.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent ac9816dc

arch/powerpc/include/asm/module.h

+5 −8
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ struct mod_arch_specific { 
	unsigned int stubs_section;	/* Index of stubs section in module */

	unsigned int toc_section;	/* What section is the TOC? */

	bool toc_fixed;			/* Have we fixed up .TOC.? */

#ifdef CONFIG_DYNAMIC_FTRACE

	unsigned long toc;

	unsigned long tramp;

#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS

	unsigned long tramp_regs;

#endif

#endif



	/* For module function descriptor dereference */

	unsigned long start_opd;
@@ -65,10 +58,14 @@ struct mod_arch_specific { 
	/* Indices of PLT sections within module. */

	unsigned int core_plt_section;

	unsigned int init_plt_section;

#endif /* powerpc64 */



#ifdef CONFIG_DYNAMIC_FTRACE

	unsigned long tramp;

#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS

	unsigned long tramp_regs;

#endif

#endif

#endif /* powerpc64 */



	/* List of BUG addresses, source line numbers and filenames */

	struct list_head bug_list;

arch/powerpc/kernel/module_64.c

+0 −1
Original line number Diff line number Diff line
@@ -823,7 +823,6 @@ static unsigned long create_ftrace_stub(const Elf64_Shdr *sechdrs, 


int module_finalize_ftrace(struct module *mod, const Elf_Shdr *sechdrs)

{

	mod->arch.toc = my_r2(sechdrs, mod);

	mod->arch.tramp = create_ftrace_stub(sechdrs, mod,

					(unsigned long)ftrace_caller);

#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS