aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2015-04-03 18:24:41 -0400
committerRalf Baechle <ralf@linux-mips.org>2015-04-07 19:09:01 -0400
commita49dc4276e07fb94858bcaf46bf99ac3effd026a (patch)
treed8df6c8f8aca3ab62320f8de5cda4eb670119756 /arch
parentb844bc781b7bb4fa49c0a26f998d9ba10ecc3742 (diff)
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: Maciej 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: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/elf.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/mips/kernel/elf.c b/arch/mips/kernel/elf.c
index d2c09f6475c5..be4899f3c393 100644
--- a/arch/mips/kernel/elf.c
+++ b/arch/mips/kernel/elf.c
@@ -131,16 +131,6 @@ int arch_elf_pt_proc(void *_ehdr, void *_phdr, struct file *elf,
131 return 0; 131 return 0;
132} 132}
133 133
134static inline unsigned get_fp_abi(int in_abi)
135{
136 /* If the ABI requirement is provided, simply return that */
137 if (in_abi != MIPS_ABI_FP_UNKNOWN)
138 return in_abi;
139
140 /* Unknown ABI */
141 return MIPS_ABI_FP_UNKNOWN;
142}
143
144int arch_check_elf(void *_ehdr, bool has_interpreter, 134int arch_check_elf(void *_ehdr, bool has_interpreter,
145 struct arch_elf_state *state) 135 struct arch_elf_state *state)
146{ 136{
@@ -151,10 +141,10 @@ int arch_check_elf(void *_ehdr, bool has_interpreter,
151 if (!config_enabled(CONFIG_MIPS_O32_FP64_SUPPORT)) 141 if (!config_enabled(CONFIG_MIPS_O32_FP64_SUPPORT))
152 return 0; 142 return 0;
153 143
154 fp_abi = get_fp_abi(state->fp_abi); 144 fp_abi = state->fp_abi;
155 145
156 if (has_interpreter) { 146 if (has_interpreter) {
157 interp_fp_abi = get_fp_abi(state->interp_fp_abi); 147 interp_fp_abi = state->interp_fp_abi;
158 148
159 abi0 = min(fp_abi, interp_fp_abi); 149 abi0 = min(fp_abi, interp_fp_abi);
160 abi1 = max(fp_abi, interp_fp_abi); 150 abi1 = max(fp_abi, interp_fp_abi);