Commit 5b89492c authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Finalise cleanup around ABI use 



Now that we have CONFIG_PPC64_ELF_ABI_V1 and CONFIG_PPC64_ELF_ABI_V2,
get rid of all indirect detection of ABI version.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/709d9d69523c14c8a9fba4486395dca0f2d675b1.1652074503.git.christophe.leroy@csgroup.eu
parent 7d40aff8

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ config PPC 
	select HAVE_EFFICIENT_UNALIGNED_ACCESS	if !(CPU_LITTLE_ENDIAN && POWER7_CPU)

	select HAVE_FAST_GUP

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_DESCRIPTORS	if PPC64 && !CPU_LITTLE_ENDIAN

	select HAVE_FUNCTION_DESCRIPTORS	if PPC64_ELF_ABI_V1

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ CHECKFLAGS += -m$(BITS) -D__powerpc__ -D__powerpc$(BITS)__ 
ifdef CONFIG_CPU_BIG_ENDIAN

CHECKFLAGS	+= -D__BIG_ENDIAN__

else

CHECKFLAGS	+= -D__LITTLE_ENDIAN__ -D_CALL_ELF=2

CHECKFLAGS	+= -D__LITTLE_ENDIAN__

endif



ifdef CONFIG_476FPE_ERR46

arch/powerpc/include/asm/types.h

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ 


#include <uapi/asm/types.h>



#ifdef __powerpc64__

#if defined(_CALL_ELF) && _CALL_ELF == 2

#define PPC64_ELF_ABI_v2 1

#else

#define PPC64_ELF_ABI_v1 1

#endif

#endif /* __powerpc64__ */



#ifndef __ASSEMBLY__



typedef __vector128 vector128;

arch/powerpc/kernel/fadump.c

+8 −5
Original line number Diff line number Diff line
@@ -978,11 +978,14 @@ static int fadump_init_elfcore_header(char *bufp) 
	elf->e_entry = 0;

	elf->e_phoff = sizeof(struct elfhdr);

	elf->e_shoff = 0;

#if defined(_CALL_ELF)

	elf->e_flags = _CALL_ELF;

#else



	if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2))

		elf->e_flags = 2;

	else if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V1))

		elf->e_flags = 1;

	else

		elf->e_flags = 0;

#endif



	elf->e_ehsize = sizeof(struct elfhdr);

	elf->e_phentsize = sizeof(struct elf_phdr);

	elf->e_phnum = 0;

arch/powerpc/kernel/ptrace/ptrace.c

+0 −6
Original line number Diff line number Diff line
@@ -444,10 +444,4 @@ void __init pt_regs_check(void) 
	 * real registers.

	 */

	BUILD_BUG_ON(PT_DSCR < sizeof(struct user_pt_regs) / sizeof(unsigned long));



#ifdef CONFIG_PPC64_ELF_ABI_V1

	BUILD_BUG_ON(!IS_ENABLED(CONFIG_HAVE_FUNCTION_DESCRIPTORS));

#else

	BUILD_BUG_ON(IS_ENABLED(CONFIG_HAVE_FUNCTION_DESCRIPTORS));

#endif

}