From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Hubbard Subject: [PATCH v2 03/18] goldish_pipe: rename local pin_user_pages() routine Date: Sun, 3 Nov 2019 13:17:58 -0800 Message-ID: <20191103211813.213227-4-jhubbard@nvidia.com> References: <20191103211813.213227-1-jhubbard@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20191103211813.213227-1-jhubbard@nvidia.com> Sender: netdev-owner@vger.kernel.org To: Andrew Morton Cc: Al Viro , Alex Williamson , Benjamin Herrenschmidt , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Christoph Hellwig , Dan Williams , Daniel Vetter , Dave Chinner , David Airlie , "David S . Miller" , Ira Weiny , Jan Kara , Jason Gunthorpe , Jens Axboe , Jonathan Corbet , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Magnus Karlsson , Mauro Carvalho Chehab , Michael Ellerman M List-Id: dri-devel@lists.freedesktop.org 1. Avoid naming conflicts: rename local static function from "pin_user_pages()" to "pin_goldfish_pages()". An upcoming patch will introduce a global pin_user_pages() function. Reviewed-by: Ira Weiny Signed-off-by: John Hubbard --- drivers/platform/goldfish/goldfish_pipe.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/g= oldfish/goldfish_pipe.c index cef0133aa47a..7ed2a21a0bac 100644 --- a/drivers/platform/goldfish/goldfish_pipe.c +++ b/drivers/platform/goldfish/goldfish_pipe.c @@ -257,12 +257,12 @@ static int goldfish_pipe_error_convert(int status) } } =20 -static int pin_user_pages(unsigned long first_page, - unsigned long last_page, - unsigned int last_page_size, - int is_write, - struct page *pages[MAX_BUFFERS_PER_COMMAND], - unsigned int *iter_last_page_size) +static int pin_goldfish_pages(unsigned long first_page, + unsigned long last_page, + unsigned int last_page_size, + int is_write, + struct page *pages[MAX_BUFFERS_PER_COMMAND], + unsigned int *iter_last_page_size) { int ret; int requested_pages =3D ((last_page - first_page) >> PAGE_SHIFT) + 1; @@ -354,9 +354,9 @@ static int transfer_max_buffers(struct goldfish_pipe *p= ipe, if (mutex_lock_interruptible(&pipe->lock)) return -ERESTARTSYS; =20 - pages_count =3D pin_user_pages(first_page, last_page, - last_page_size, is_write, - pipe->pages, &iter_last_page_size); + pages_count =3D pin_goldfish_pages(first_page, last_page, + last_page_size, is_write, + pipe->pages, &iter_last_page_size); if (pages_count < 0) { mutex_unlock(&pipe->lock); return pages_count; --=20 2.23.0 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.8 required=3.0 tests=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 4B1F3CA9ECF for ; Mon, 4 Nov 2019 07:54:29 +0000 (UTC) Received: from gabe.freedesktop.org (unknown [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 00694218BA for ; Mon, 4 Nov 2019 07:54:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00694218BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B2F86E14D; Mon, 4 Nov 2019 07:54:23 +0000 (UTC) Received: from hqemgate16.nvidia.com (hqemgate16.nvidia.com [216.228.121.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF7FB6E10F for ; Mon, 4 Nov 2019 00:40:12 +0000 (UTC) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Sun, 03 Nov 2019 13:18:22 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Sun, 03 Nov 2019 13:18:15 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Sun, 03 Nov 2019 13:18:15 -0800 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Sun, 3 Nov 2019 21:18:15 +0000 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Sun, 3 Nov 2019 21:18:15 +0000 Received: from blueforge.nvidia.com (Not Verified[10.110.48.28]) by hqnvemgw01.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Sun, 03 Nov 2019 13:18:15 -0800 From: John Hubbard To: Andrew Morton Subject: [PATCH v2 03/18] goldish_pipe: rename local pin_user_pages() routine Date: Sun, 3 Nov 2019 13:17:58 -0800 Message-ID: <20191103211813.213227-4-jhubbard@nvidia.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191103211813.213227-1-jhubbard@nvidia.com> References: <20191103211813.213227-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Mailman-Approved-At: Mon, 04 Nov 2019 07:54:21 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1572815902; bh=yxndnpa6bj0xuoqPqvRY6Qkte9w9GoWasaTzIgTLBt4=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-NVConfidentiality: Content-Transfer-Encoding:Content-Type; b=CrZf2JZ8Z1BYEcbLmYpFUD1ZNvhKRHAjpH0YXVbR2NxZF7sRz7rzdYCVUfbyeDKkX 2g2B6QpG23BEG3g/71RW3OuY9p0N3tXefMp1ZYbFTW1iz2PLwALdJ+mkuVyb1iqsZr F8sWxJDJO54yzjEP4wU9YZdl8I/hsHy8pE37+OizFKv6wlKVuaPeh5mzoi0KCgmnBg /Y00qBw+/btgnF7T7NnqeETOhIof/gF2HPnAs7yZ+7cxOlyZsmzW+pd420DMcmtwfZ vgdXxoB17ve4yALSsXuszIbA5INhDD5JbZJUAmVEfJrKoaspcnukDpzoiq6VEYRf9+ tELlqsr98UjAA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , Jan Kara , kvm@vger.kernel.org, linux-doc@vger.kernel.org, David Airlie , Dave Chinner , dri-devel@lists.freedesktop.org, LKML , linux-mm@kvack.org, Paul Mackerras , linux-kselftest@vger.kernel.org, Ira Weiny , Jonathan Corbet , linux-rdma@vger.kernel.org, Michael Ellerman , Christoph Hellwig , Jason Gunthorpe , Vlastimil Babka , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , linux-media@vger.kernel.org, Shuah Khan , John Hubbard , linux-block@vger.kernel.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Al Viro , Dan Williams , Mauro Carvalho Chehab , Magnus Karlsson , Jens Axboe , netdev@vger.kernel.org, Alex Williamson , linux-fsdevel@vger.kernel.org, bpf@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "David S . Miller" , Mike Kravetz Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191103211758.O5LCyT1vB1Zsvi4Ih26FM8mFRf-HgGrvyb_Ieio2D8I@z> MS4gQXZvaWQgbmFtaW5nIGNvbmZsaWN0czogcmVuYW1lIGxvY2FsIHN0YXRpYyBmdW5jdGlvbiBm cm9tCiJwaW5fdXNlcl9wYWdlcygpIiB0byAicGluX2dvbGRmaXNoX3BhZ2VzKCkiLgoKQW4gdXBj b21pbmcgcGF0Y2ggd2lsbCBpbnRyb2R1Y2UgYSBnbG9iYWwgcGluX3VzZXJfcGFnZXMoKQpmdW5j dGlvbi4KClJldmlld2VkLWJ5OiBJcmEgV2VpbnkgPGlyYS53ZWlueUBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IEpvaG4gSHViYmFyZCA8amh1YmJhcmRAbnZpZGlhLmNvbT4KLS0tCiBkcml2ZXJz L3BsYXRmb3JtL2dvbGRmaXNoL2dvbGRmaXNoX3BpcGUuYyB8IDE4ICsrKysrKysrKy0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL3BsYXRmb3JtL2dvbGRmaXNoL2dvbGRmaXNoX3BpcGUuYyBiL2RyaXZl cnMvcGxhdGZvcm0vZ29sZGZpc2gvZ29sZGZpc2hfcGlwZS5jCmluZGV4IGNlZjAxMzNhYTQ3YS4u N2VkMmEyMWEwYmFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL3BsYXRmb3JtL2dvbGRmaXNoL2dvbGRm aXNoX3BpcGUuYworKysgYi9kcml2ZXJzL3BsYXRmb3JtL2dvbGRmaXNoL2dvbGRmaXNoX3BpcGUu YwpAQCAtMjU3LDEyICsyNTcsMTIgQEAgc3RhdGljIGludCBnb2xkZmlzaF9waXBlX2Vycm9yX2Nv bnZlcnQoaW50IHN0YXR1cykKIAl9CiB9CiAKLXN0YXRpYyBpbnQgcGluX3VzZXJfcGFnZXModW5z aWduZWQgbG9uZyBmaXJzdF9wYWdlLAotCQkJICB1bnNpZ25lZCBsb25nIGxhc3RfcGFnZSwKLQkJ CSAgdW5zaWduZWQgaW50IGxhc3RfcGFnZV9zaXplLAotCQkJICBpbnQgaXNfd3JpdGUsCi0JCQkg IHN0cnVjdCBwYWdlICpwYWdlc1tNQVhfQlVGRkVSU19QRVJfQ09NTUFORF0sCi0JCQkgIHVuc2ln bmVkIGludCAqaXRlcl9sYXN0X3BhZ2Vfc2l6ZSkKK3N0YXRpYyBpbnQgcGluX2dvbGRmaXNoX3Bh Z2VzKHVuc2lnbmVkIGxvbmcgZmlyc3RfcGFnZSwKKwkJCSAgICAgIHVuc2lnbmVkIGxvbmcgbGFz dF9wYWdlLAorCQkJICAgICAgdW5zaWduZWQgaW50IGxhc3RfcGFnZV9zaXplLAorCQkJICAgICAg aW50IGlzX3dyaXRlLAorCQkJICAgICAgc3RydWN0IHBhZ2UgKnBhZ2VzW01BWF9CVUZGRVJTX1BF Ul9DT01NQU5EXSwKKwkJCSAgICAgIHVuc2lnbmVkIGludCAqaXRlcl9sYXN0X3BhZ2Vfc2l6ZSkK IHsKIAlpbnQgcmV0OwogCWludCByZXF1ZXN0ZWRfcGFnZXMgPSAoKGxhc3RfcGFnZSAtIGZpcnN0 X3BhZ2UpID4+IFBBR0VfU0hJRlQpICsgMTsKQEAgLTM1NCw5ICszNTQsOSBAQCBzdGF0aWMgaW50 IHRyYW5zZmVyX21heF9idWZmZXJzKHN0cnVjdCBnb2xkZmlzaF9waXBlICpwaXBlLAogCWlmICht dXRleF9sb2NrX2ludGVycnVwdGlibGUoJnBpcGUtPmxvY2spKQogCQlyZXR1cm4gLUVSRVNUQVJU U1lTOwogCi0JcGFnZXNfY291bnQgPSBwaW5fdXNlcl9wYWdlcyhmaXJzdF9wYWdlLCBsYXN0X3Bh Z2UsCi0JCQkJICAgICBsYXN0X3BhZ2Vfc2l6ZSwgaXNfd3JpdGUsCi0JCQkJICAgICBwaXBlLT5w YWdlcywgJml0ZXJfbGFzdF9wYWdlX3NpemUpOworCXBhZ2VzX2NvdW50ID0gcGluX2dvbGRmaXNo X3BhZ2VzKGZpcnN0X3BhZ2UsIGxhc3RfcGFnZSwKKwkJCQkJIGxhc3RfcGFnZV9zaXplLCBpc193 cml0ZSwKKwkJCQkJIHBpcGUtPnBhZ2VzLCAmaXRlcl9sYXN0X3BhZ2Vfc2l6ZSk7CiAJaWYgKHBh Z2VzX2NvdW50IDwgMCkgewogCQltdXRleF91bmxvY2soJnBpcGUtPmxvY2spOwogCQlyZXR1cm4g cGFnZXNfY291bnQ7Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbA==