From patchwork Sun Jul 24 15:30:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 9244987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AA4F0607FD for ; Sun, 24 Jul 2016 15:37:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A34925F3E for ; Sun, 24 Jul 2016 15:37:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D9A626224; Sun, 24 Jul 2016 15:37:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2927125F3E for ; Sun, 24 Jul 2016 15:37:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bRLQu-0003Nb-HZ; Sun, 24 Jul 2016 15:35:12 +0000 Received: from alt13.smtp-out.videotron.ca ([135.19.0.26] helo=alt12.smtp-out.videotron.ca) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bRLMq-0008Pv-Lh for linux-arm-kernel@lists.infradead.org; Sun, 24 Jul 2016 15:31:10 +0000 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id RLMUbx2oaHh2dRLMVbZL9O; Sun, 24 Jul 2016 11:30:39 -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 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 9F6DA2DA06B0; Sun, 24 Jul 2016 11:30:36 -0400 (EDT) From: Nicolas Pitre To: Greg Ungerer , linux-fsdevel@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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160724_083101_042695_7DA6EB76 X-CRM114-Status: UNSURE ( 8.74 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alan Cox , linux-kernel@vger.kernel.org, David Howells , linux-m68k@lists.linux-m68k.org, Alexander Viro , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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.