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

Commit a49dc427 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

MIPS: ELF: Drop `get_fp_abi' 



Commit 46490b57 [MIPS: kernel: elf: Improve the overall ABI and FPU mode
checks] reduced `get_fp_abi' to an elaborate pass-through.  Drop it
then.

Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9677/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b844bc78

arch/mips/kernel/elf.c

+2 −12
Original line number Diff line number Diff line
@@ -131,16 +131,6 @@ int arch_elf_pt_proc(void *_ehdr, void *_phdr, struct file *elf, 
	return 0;

}



static inline unsigned get_fp_abi(int in_abi)

{

	/* If the ABI requirement is provided, simply return that */

	if (in_abi != MIPS_ABI_FP_UNKNOWN)

		return in_abi;



	/* Unknown ABI */

	return MIPS_ABI_FP_UNKNOWN;

}



int arch_check_elf(void *_ehdr, bool has_interpreter,

		   struct arch_elf_state *state)

{
@@ -151,10 +141,10 @@ int arch_check_elf(void *_ehdr, bool has_interpreter, 
	if (!config_enabled(CONFIG_MIPS_O32_FP64_SUPPORT))

		return 0;



	fp_abi = get_fp_abi(state->fp_abi);

	fp_abi = state->fp_abi;



	if (has_interpreter) {

		interp_fp_abi = get_fp_abi(state->interp_fp_abi);

		interp_fp_abi = state->interp_fp_abi;



		abi0 = min(fp_abi, interp_fp_abi);

		abi1 = max(fp_abi, interp_fp_abi);