Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1042365pxb; Tue, 9 Feb 2021 21:09:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxD8Suk3w3Iv7jxLiLHGetMoflNoiq6JcS/ccRpFaPc+Zm3ZcQ9hSxkE5zrfniv5NOb8YJ+ X-Received: by 2002:a05:6402:3585:: with SMTP id y5mr1439198edc.97.1612933768472; Tue, 09 Feb 2021 21:09:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612933768; cv=none; d=google.com; s=arc-20160816; b=gJ+VqjseoK4oKzcymKP/VQBJSkZeqqgHjGdV9ZIEiMSu0oToUfXLGs+kSIj77hRLAw LHVA9c35ELxU56R1z3w9hSqSOUvXs9LJ/gVgNPa9hXgtqdvU4e0hQGm0TP6t2pjbzrMi XpvRbky0w6yo6Yogtq6olJ7l56mkVtM2/hhbTRGe83gufxY1Hzw/8j53Dn6RwmlayBhT T5AMqFKmjvsZZavIynXWel/F91ZuFBzwSYOXsZ9gMPhOkpvuH4leFvm5i/mzQeRmE35I MgpgeZfS9abOV1Q4f24qSAxDnNYARJDZo0ukDuYNAUQVRtDgFzbmJTPD15Zg+pwXgcfu n/MQ== 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=sYs59lszH8AYE+iqQjxsRFR8mwyp9ri9y85prGJKQoM=; b=xvM0PwYxVV2NOVTNwtyQzv9ztgVVRJcWUHbIcEXVPsFBPPbPk+n3dloqeOsuUz98aX FnF7MX6bpJCHlDG5i2SoAFNtd76wASBxWvQ9X5w/2Tbbwo5fPLdzkv+POyLxNh9haask 2xjl3cDoLDc5aVCwLruyZSTJWHtMcgVKhmz6v0jN+ScxF0qUiXpDkdi9pEcBHE+h9YKl U8pOveL7MYYaebHMJWX34RXwhQwBiigdmjlzsbUeSWkaGDeLE4/axb7ey69cpPayUe8I ZPuxyZESaHBJYWfb1OUbsw+TFU9rK2qLaNcZ/xVTyk7pZbRYXMatx9WYCnHtS+MgSTrS CFmA== 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 i26si643966edu.267.2021.02.09.21.09.05; Tue, 09 Feb 2021 21:09:28 -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 S231265AbhBIODu (ORCPT + 99 others); Tue, 9 Feb 2021 09:03:50 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:7527 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231655AbhBIOC7 (ORCPT ); Tue, 9 Feb 2021 09:02:59 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DZl2F5sGlz9v0KF; Tue, 9 Feb 2021 15:02:13 +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 p6-Bo566TAbD; Tue, 9 Feb 2021 15:02:13 +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 4DZl2F4yJ7z9v0KB; Tue, 9 Feb 2021 15:02:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0997E8B7E7; Tue, 9 Feb 2021 15:02:15 +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 ICB81XodAmk8; Tue, 9 Feb 2021 15:02:14 +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 BEAA28B764; Tue, 9 Feb 2021 15:02:14 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 9A3F767359; Tue, 9 Feb 2021 14:02:14 +0000 (UTC) Message-Id: <3ae114740317187e12edbd5ffa9157cb8c396dea.1612879284.git.christophe.leroy@csgroup.eu> In-Reply-To: <99d4ccb58a20d8408d0e19874393655ad5b40822.1612879284.git.christophe.leroy@csgroup.eu> References: <99d4ccb58a20d8408d0e19874393655ad5b40822.1612879284.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH v2 3/3] powerpc/uaccess: Merge raw_copy_to_user_allowed() into raw_copy_to_user() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 9 Feb 2021 14:02:14 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit 17bc43367fc2 ("powerpc/uaccess: Implement unsafe_copy_to_user() as a simple loop"), raw_copy_to_user_allowed() is only used by raw_copy_to_user(). Merge raw_copy_to_user_allowed() into raw_copy_to_user(). Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/uaccess.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h index 2fb1d95f10d3..33b2de642120 100644 --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -401,19 +401,13 @@ static inline unsigned long raw_copy_from_user(void *to, return ret; } -static inline unsigned long -raw_copy_to_user_allowed(void __user *to, const void *from, unsigned long n) -{ - return __copy_tofrom_user(to, (__force const void __user *)from, n); -} - static inline unsigned long raw_copy_to_user(void __user *to, const void *from, unsigned long n) { unsigned long ret; allow_write_to_user(to, n); - ret = raw_copy_to_user_allowed(to, from, n); + ret = __copy_tofrom_user(to, (__force const void __user *)from, n); prevent_write_to_user(to, n); return ret; } -- 2.25.0