Re: [PATCH v2 01/13] powerpc: Move 'struct ppc64_opd_entry' back into asm/elf.h
From: Nicholas Piggin <npiggin@gmail.com>
Date: 2021-10-15 05:58:05
Also in:
linux-mm, linuxppc-dev, lkml
Excerpts from Christophe Leroy's message of October 14, 2021 3:49 pm:
quoted hunk ↗ jump to hunk
'struct ppc64_opd_entry' doesn't belong to uapi/asm/elf.h It was initially in module_64.c and commit 2d291e902791 ("Fix compile failure with non modular builds") moved it into asm/elf.h But it was by mistake added outside of __KERNEL__ section, therefore commit c3617f72036c ("UAPI: (Scripted) Disintegrate arch/powerpc/include/asm") moved it to uapi/asm/elf.h Move it back into asm/elf.h, this brings it back in line with IA64 and PARISC architectures. Fixes: 2d291e902791 ("Fix compile failure with non modular builds") Reviewed-by: Kees Cook <redacted> Signed-off-by: Christophe Leroy <redacted> --- arch/powerpc/include/asm/elf.h | 6 ++++++ arch/powerpc/include/uapi/asm/elf.h | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-)diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index b8425e3cfd81..a4406714c060 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h@@ -176,4 +176,10 @@ do { \ /* Relocate the kernel image to @final_address */ void relocate(unsigned long final_address); +/* There's actually a third entry here, but it's unused */ +struct ppc64_opd_entry { + unsigned long funcaddr; + unsigned long r2; +};
Reviewed-by: Nicholas Piggin <npiggin@gmail.com> I wonder if we should add that third entry, just for completeness. And 'r2' isn't a good name should probably be toc. And should it be packed? At any rate that's not for your series, a cleanup I might think about for later. Thanks, Nick