diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2016-08-05 07:03:41 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-12 17:47:05 +0200 |
| commit | d782e426b835bd2e79d868eb4af8510ed79e0aee (patch) | |
| tree | fc96553e852220f81d88475037e7f907821c2dab /arch/arm/include/asm/flat.h | |
| parent | ARM: 8593/1: cache-l2x0.c: Do not clear bit 23 in prefetch control register (diff) | |
| download | linux-d782e426b835bd2e79d868eb4af8510ed79e0aee.tar.xz linux-d782e426b835bd2e79d868eb4af8510ed79e0aee.zip | |
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: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/flat.h')
| -rw-r--r-- | arch/arm/include/asm/flat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h index e847d23351ed..acf1d14b89a6 100644 --- a/arch/arm/include/asm/flat.h +++ b/arch/arm/include/asm/flat.h @@ -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 |