Messages in this thread Patch in this message | | | From | Nicolas Pitre <> | Subject | [PATCH v5 14/15] m68k: enable binfmt_flat on systems with an MMU | Date | Sun, 24 Jul 2016 11:30:28 -0400 |
| |
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> --- arch/m68k/include/asm/flat.h | 5 +++-- fs/Kconfig.binfmt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h index f46c2f044f..a97c479b11 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, diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 72c03354c1..c7efddf6e0 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -89,7 +89,8 @@ config BINFMT_SCRIPT config BINFMT_FLAT bool "Kernel support for flat binaries" - depends on !MMU && (!FRV || BROKEN) + depends on !MMU || M68K + depends on !FRV || BROKEN help Support uClinux FLAT format binaries. -- 2.7.4
| |