From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EC3BC47256 for ; Wed, 6 May 2020 06:22:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E5DA920747 for ; Wed, 6 May 2020 06:22:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="AnF0/P5T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E5DA920747 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8214C8E0007; Wed, 6 May 2020 02:22:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D06E8E0003; Wed, 6 May 2020 02:22:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 671D68E0007; Wed, 6 May 2020 02:22:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0028.hostedemail.com [216.40.44.28]) by kanga.kvack.org (Postfix) with ESMTP id 4DDC68E0003 for ; Wed, 6 May 2020 02:22:35 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0E4E1180AD806 for ; Wed, 6 May 2020 06:22:35 +0000 (UTC) X-FDA: 76785300270.18.bread45_168894e80ab47 X-HE-Tag: bread45_168894e80ab47 X-Filterd-Recvd-Size: 5917 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Wed, 6 May 2020 06:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=FhwjB9eDi0xwZgnRZDImeNjcc9cNIZkOcwQVq4y1nSU=; b=AnF0/P5TZEydKVjeOns7QO94Ue orcDWvTLvKyPcbOPYUhH2LvdJ3J06jkTlJkjDMCbGLBgmIZDx1HWExFEW9948O4Sew/Hfp5+rIR6g 0UrQCf4UPCzdQEjDavtNWl5ssnjBntXnshr8IXkXCGMLVJ+jGwV7BcbWIBCZnGOQUwvS8cT34l2OP Ofm4bUGBPTy//AFzotLCvwvWC0fmbezmQUQnMrOEVauvvOQvuhy61W2hBgkahmuNiK4ZWXzxlqOsc JFdmMjGXww6cBMKhBGJ7OSEeIed8kRVgSHZEqdkyvzFvd5jkqWmcg4ODg7qYngBd1FA+YR3o2vrvz AslZVoSA==; Received: from [2001:4bb8:191:66b6:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWDRv-0006LL-HJ; Wed, 06 May 2020 06:22:32 +0000 From: Christoph Hellwig To: x86@kernel.org, Alexei Starovoitov , Daniel Borkmann , Masami Hiramatsu , Linus Torvalds , Andrew Morton Cc: linux-parisc@vger.kernel.org, linux-um@lists.infradead.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/15] maccess: remove various unused weak aliases Date: Wed, 6 May 2020 08:22:10 +0200 Message-Id: <20200506062223.30032-3-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200506062223.30032-1-hch@lst.de> References: <20200506062223.30032-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: maccess tends to define lots of underscore prefixed symbols that then have other weak aliases. But except for two cases they are never actually used, so remove them. Signed-off-by: Christoph Hellwig --- include/linux/uaccess.h | 3 --- mm/maccess.c | 19 +++---------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 67f016010aad5..a2c606a403745 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -324,7 +324,6 @@ extern long __probe_kernel_read(void *dst, const void= *src, size_t size); * happens, handle that and return -EFAULT. */ extern long probe_user_read(void *dst, const void __user *src, size_t si= ze); -extern long __probe_user_read(void *dst, const void __user *src, size_t = size); =20 /* * probe_kernel_write(): safely attempt to write to a location @@ -336,7 +335,6 @@ extern long __probe_user_read(void *dst, const void _= _user *src, size_t size); * happens, handle that and return -EFAULT. */ extern long notrace probe_kernel_write(void *dst, const void *src, size_= t size); -extern long notrace __probe_kernel_write(void *dst, const void *src, siz= e_t size); =20 /* * probe_user_write(): safely attempt to write to a location in user spa= ce @@ -348,7 +346,6 @@ extern long notrace __probe_kernel_write(void *dst, c= onst void *src, size_t size * happens, handle that and return -EFAULT. */ extern long notrace probe_user_write(void __user *dst, const void *src, = size_t size); -extern long notrace __probe_user_write(void __user *dst, const void *src= , size_t size); =20 extern long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long= count); extern long strncpy_from_unsafe_strict(char *dst, const void *unsafe_add= r, diff --git a/mm/maccess.c b/mm/maccess.c index cf21e604f78cb..4e7f3b6eb05ae 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -79,11 +79,7 @@ EXPORT_SYMBOL_GPL(probe_kernel_read); * Safely read from user address @src to the buffer at @dst. If a kernel= fault * happens, handle that and return -EFAULT. */ - -long __weak probe_user_read(void *dst, const void __user *src, size_t si= ze) - __attribute__((alias("__probe_user_read"))); - -long __probe_user_read(void *dst, const void __user *src, size_t size) +long probe_user_read(void *dst, const void __user *src, size_t size) { long ret =3D -EFAULT; mm_segment_t old_fs =3D get_fs(); @@ -106,11 +102,7 @@ EXPORT_SYMBOL_GPL(probe_user_read); * Safely write to address @dst from the buffer at @src. If a kernel fa= ult * happens, handle that and return -EFAULT. */ - -long __weak probe_kernel_write(void *dst, const void *src, size_t size) - __attribute__((alias("__probe_kernel_write"))); - -long __probe_kernel_write(void *dst, const void *src, size_t size) +long probe_kernel_write(void *dst, const void *src, size_t size) { long ret; mm_segment_t old_fs =3D get_fs(); @@ -131,11 +123,7 @@ long __probe_kernel_write(void *dst, const void *src= , size_t size) * Safely write to address @dst from the buffer at @src. If a kernel fa= ult * happens, handle that and return -EFAULT. */ - -long __weak probe_user_write(void __user *dst, const void *src, size_t s= ize) - __attribute__((alias("__probe_user_write"))); - -long __probe_user_write(void __user *dst, const void *src, size_t size) +long probe_user_write(void __user *dst, const void *src, size_t size) { long ret =3D -EFAULT; mm_segment_t old_fs =3D get_fs(); @@ -171,7 +159,6 @@ long __probe_user_write(void __user *dst, const void = *src, size_t size) * probing memory on a user address range where strncpy_from_unsafe_user= () is * supposed to be used instead. */ - long __weak strncpy_from_unsafe(char *dst, const void *unsafe_addr, long= count) __attribute__((alias("__strncpy_from_unsafe"))); =20 --=20 2.26.2