diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2016-07-24 11:30:28 -0400 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2016-07-28 13:29:13 +1000 |
| commit | 002d2f01f13f1671d771e1493a3405ed4986694d (patch) | |
| tree | c20e560cea52a5fdfde6be507b8a519bef83df74 /arch/m68k | |
| parent | 472f95f32d5aa07eda96a6b2578b85d7b27c5110 (diff) | |
| download | linux-002d2f01f13f1671d771e1493a3405ed4986694d.tar.bz2 | |
m68k: enable binfmt_flat on systems with an MMU
Now that the generic changes are in place, this can be enabled on m68k
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: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/flat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h index 8e58d47be90d..00c392b0cabd 100644 --- a/arch/m68k/include/asm/flat.h +++ b/arch/m68k/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, p) 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, p) \ + ({ 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) static inline int flat_set_persistent(unsigned long relval, |