Commit 002d2f01 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Greg Ungerer

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: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent 472f95f3
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
#define flat_argvp_envp_on_stack() 1 #define flat_argvp_envp_on_stack() 1
#define flat_old_ram_flag(flags) (flags) #define flat_old_ram_flag(flags) (flags)
#define flat_reloc_valid(reloc, size) ((reloc) <= (size)) #define flat_reloc_valid(reloc, size) ((reloc) <= (size))
#define flat_get_addr_from_rp(rp, relval, flags, p) get_unaligned(rp) #define flat_get_addr_from_rp(rp, relval, flags, p) \
#define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp) ({ 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_get_relocate_addr(rel) (rel)
static inline int flat_set_persistent(unsigned long relval, static inline int flat_set_persistent(unsigned long relval,
......
...@@ -89,7 +89,8 @@ config BINFMT_SCRIPT ...@@ -89,7 +89,8 @@ config BINFMT_SCRIPT
config BINFMT_FLAT config BINFMT_FLAT
bool "Kernel support for flat binaries" bool "Kernel support for flat binaries"
depends on !MMU && (!FRV || BROKEN) depends on !MMU || M68K
depends on !FRV || BROKEN
help help
Support uClinux FLAT format binaries. Support uClinux FLAT format binaries.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment