From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752492AbcGXPbO (ORCPT ); Sun, 24 Jul 2016 11:31:14 -0400 Received: from alt13.smtp-out.videotron.ca ([135.19.0.26]:10833 "EHLO alt12.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751909AbcGXPam (ORCPT ); Sun, 24 Jul 2016 11:30:42 -0400 X-Authority-Analysis: v=2.1 cv=Lv0ysipc c=1 sm=1 tr=0 a=keA3yYpnlypCNW5BNWqu+w==:117 a=keA3yYpnlypCNW5BNWqu+w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=cAmyUtKerLwA:10 a=KKAkSRfTAAAA:8 a=lE0LptPQsfaGjRLw4EQA:9 a=cvBusfyB2V15izCimMoJ:22 From: Nicolas Pitre To: Greg Ungerer , linux-fsdevel@vger.kernel.org Cc: Alan Cox , Alexander Viro , David Howells , linux-arm-kernel@lists.infradead.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 14/15] m68k: enable binfmt_flat on systems with an MMU Date: Sun, 24 Jul 2016 11:30:28 -0400 Message-Id: <1469374229-21585-15-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469374229-21585-1-git-send-email-nicolas.pitre@linaro.org> References: <1469374229-21585-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfHJdigL4HZsTbhxaz3Sua2cw0NUAr3hlt0h5DN0toKIxzm6ETgoexfeV2ffOvdecIC9LaHHlVDzGtIKi5D/lIbkjWAAx3LXJUP23wv9EGvDDNIhoi5EL 3+gZ19vvG8VB3V5jSU3HKSCiO8dM1920VnLVJlsUKl8oiLyndLkMDWT6+EdReEQfwmWu3RmvZXIog63p4tXMgqF8wHX8IXgE6K4OvIPef3qOtQ+13qKINqXo sY8JwfMX3d4jgE6LECL06TbYA4PujkyQrsbJWSf3FxE6d18pprtADwfLHZVOrJ3NWx4nV5dke2YJ0HDuyzGRmpk0Yglb7TeFQJj8xZoDE51h1KrE7MFX1xer AgVMcJFLoGtONtDVfdvTyHpKbN1nnb8K5MieypCoI4KKfPaZ4gcesPhCI5uEU5E0pkU43ZPn1DmlDQLzy3s17ZZpUu01ey+IvY7k5o11OjyxW3gBqJA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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