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

Commit d782e426 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

ARM: 8594/1: enable binfmt_flat on systems with an MMU 



Now that the generic changes are in place, this can be enabled on ARM
with the use of proper user space accessors in the flat_get_addr_from_rp()
and flat_put_addr_at_rp() handlers as rp actually holds a user space
address.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 55604b7a

arch/arm/include/asm/flat.h

+3 −2
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ 
#define	flat_argvp_envp_on_stack()		1

#define	flat_old_ram_flag(flags)		(flags)

#define	flat_reloc_valid(reloc, size)		((reloc) <= (size))

#define	flat_get_addr_from_rp(rp, relval, flags, persistent) ((void)persistent,get_unaligned(rp))

#define	flat_put_addr_at_rp(rp, val, relval)	put_unaligned(val,rp)

#define	flat_get_addr_from_rp(rp, relval, flags, persistent) \

	({ unsigned long __val; __get_user_unaligned(__val, rp); __val; })

#define	flat_put_addr_at_rp(rp, val, relval)	__put_user_unaligned(val, rp)

#define	flat_get_relocate_addr(rel)		(rel)

#define	flat_set_persistent(relval, p)		0

fs/Kconfig.binfmt

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ config BINFMT_SCRIPT 


config BINFMT_FLAT

	bool "Kernel support for flat binaries"

	depends on !MMU || M68K

	depends on !MMU || ARM || M68K

	depends on !FRV || BROKEN

	help

	  Support uClinux FLAT format binaries.