Since all current users of arch_parse_elf_property() are able to treat the
interpreter and main executable orthogonaly the has_interp argument is now
redundant so remove it.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Tested-by: Jeremy Linton <jeremy.linton@xxxxxxx>
Reviewed-By: Dave Martin <Dave.Martin@xxxxxxx>
---
arch/arm64/include/asm/elf.h | 2 +-
fs/binfmt_elf.c | 2 +-
include/linux/elf.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index c4aa60db76a4..8009e8f07f1e 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -268,7 +268,7 @@ static inline int arm64_elf_bti_flag(bool is_interp)
static inline int arch_parse_elf_property(u32 type, const void *data,
size_t datasz, bool compat,
- bool has_interp, bool is_interp,
+ bool is_interp,
struct arch_elf_state *arch)
{
/* No known properties for AArch32 yet */
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 5d24aa203b61..495436fd4559 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -753,7 +753,7 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz,
ret = arch_parse_elf_property(pr->pr_type, data + o,
pr->pr_datasz, ELF_COMPAT,
- has_interp, is_interp, arch);
+ is_interp, arch);
if (ret)
return ret;
diff --git a/include/linux/elf.h b/include/linux/elf.h
index d8392531899d..cdb080d4b34a 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -88,14 +88,14 @@ struct arch_elf_state;
#ifndef CONFIG_ARCH_USE_GNU_PROPERTY
static inline int arch_parse_elf_property(u32 type, const void *data,
size_t datasz, bool compat,
- bool has_interp, bool is_interp,
+ bool is_interp,
struct arch_elf_state *arch)
{
return 0;
}
#else
extern int arch_parse_elf_property(u32 type, const void *data, size_t datasz,
- bool compat, bool has_interp, bool is_interp,
+ bool compat, bool is_interp,
struct arch_elf_state *arch);
#endif
--
2.20.1
