diff options
Diffstat (limited to 'arch/mips/kernel/elf.c')
-rw-r--r-- | arch/mips/kernel/elf.c | 14 |
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 | ||
134 | static 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 | |||
144 | int arch_check_elf(void *_ehdr, bool has_interpreter, | 134 | int 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); |