Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp592086pxb; Thu, 25 Feb 2021 09:55:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzyr2ETBbJ8JIQuXqjtcPkarESPX3lbI9Fru/l1oOIqQzp3qKwCROda/jZtFtOKs4yZzwYp X-Received: by 2002:a17:906:1448:: with SMTP id q8mr3758620ejc.449.1614275722199; Thu, 25 Feb 2021 09:55:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614275722; cv=none; d=google.com; s=arc-20160816; b=fHdQd1sX1dj2jXO0oBs4AwQvUxf00VyVFvqpZZggH3D3cX8LGalL3U3exiEGN0nw3c FR+cqHjA7fVCzkNiHEI0ETwyOObSUoj2dBIgimxRF0Btvq6ScTxF7f+HOHw9fYXatwui p7bWbZJVQbjCzec2SnvuzvAV5P4zLXfvvH6cTEFyDkFZqsbWu4OhhqVkv474k9MpI2v3 TclcQrNlsFYZvo1tY6Rov3BixQPjUljZn4L2w1j6DdB+bFPYPrP0d2wiS1Imr8ZQWKU0 YNAOyTUPzbNj1CO7C+chChzQzikiWlqbbDZVpbuDRvDdzH8HuoYE8uH/zF1B9wMIYB1z sOGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=rOs0vI9KdebjwhRD1m1oIoVkVvaSlmh3fuhoBnKklz0=; b=TBE/N7FFPF19BmnOp7zyimgve9DsH7cRnf1co0xdrN+Twk8UgMOmNsxZHa4m+OeKiD qbBZh0luoB2CaPdCcrnQmvEacK/8BEMhnobHRt2oQpANlDnvo8d0QP7WGXLkTr1fCBj3 wdf7GarZ+iWNcHGOKCynIG4QY4uSoHPDKnj7MTgc5PJRmn+gB/Il77COv4yoe6NQm9tD yGs9YSGs2Db8SalSGYTuGw1kJ4xReFWrQtYVRr4dYPUT9m/OlgcQbZ6NNrVDIySNNOX7 kymWLagVSo4zTrZ5I1vrMUnmE9Uz0RR3VK7seii3XkaP+AGLl61O6QTly6HDN2panjQS OLGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f27si3898962ejf.555.2021.02.25.09.54.59; Thu, 25 Feb 2021 09:55:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233148AbhBYRxb (ORCPT + 99 others); Thu, 25 Feb 2021 12:53:31 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:50470 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbhBYRvT (ORCPT ); Thu, 25 Feb 2021 12:51:19 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DmgLG4GFMz9v1B2; Thu, 25 Feb 2021 18:50:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id H4bNOyJvVCAY; Thu, 25 Feb 2021 18:50:30 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4DmgLG3GqKz9v19y; Thu, 25 Feb 2021 18:50:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 4C0E48B895; Thu, 25 Feb 2021 18:50:32 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 6t6gpp1fWF42; Thu, 25 Feb 2021 18:50:32 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 154588B88B; Thu, 25 Feb 2021 18:50:32 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id E54EC67442; Thu, 25 Feb 2021 17:50:31 +0000 (UTC) Message-Id: <03d1f57f73c74748829994f8026cb274065c1d8d.1614275314.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v1 02/15] powerpc/uaccess: Define ___get_user_instr() for ppc32 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 25 Feb 2021 17:50:31 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Define simple ___get_user_instr() for ppc32 instead of defining ppc32 versions of the three get_user_instr() helpers. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/uaccess.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index 8cbf3e3874f1..a08c482b1315 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -81,6 +81,10 @@ static inline bool __access_ok(unsigned long addr, unsigned long size) } \ __gui_ret; \ }) +#else /* !CONFIG_PPC64 */ +#define ___get_user_instr(gu_op, dest, ptr) \ + gu_op((dest).val, (u32 __user *)(ptr)) +#endif /* CONFIG_PPC64 */ #define get_user_instr(x, ptr) \ ___get_user_instr(get_user, x, ptr) @@ -91,18 +95,6 @@ static inline bool __access_ok(unsigned long addr, unsigned long size) #define __get_user_instr_inatomic(x, ptr) \ ___get_user_instr(__get_user_inatomic, x, ptr) -#else /* !CONFIG_PPC64 */ -#define get_user_instr(x, ptr) \ - get_user((x).val, (u32 __user *)(ptr)) - -#define __get_user_instr(x, ptr) \ - __get_user_nocheck((x).val, (u32 __user *)(ptr), sizeof(u32), true) - -#define __get_user_instr_inatomic(x, ptr) \ - __get_user_nosleep((x).val, (u32 __user *)(ptr), sizeof(u32)) - -#endif /* CONFIG_PPC64 */ - extern long __put_user_bad(void); #define __put_user_size(x, ptr, size, retval) \ -- 2.25.0