From patchwork Fri Feb 26 11:59:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102669 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp673688lbc; Fri, 26 Feb 2016 04:01:51 -0800 (PST) X-Received: by 10.98.14.67 with SMTP id w64mr1512614pfi.154.1456488111222; Fri, 26 Feb 2016 04:01:51 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 89si19616558pfr.21.2016.02.26.04.01.50; Fri, 26 Feb 2016 04:01:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbcBZMBq (ORCPT + 30 others); Fri, 26 Feb 2016 07:01:46 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:55337 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752065AbcBZMBp (ORCPT ); Fri, 26 Feb 2016 07:01:45 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0MJHP4-1ac0uB1NmM-002mL6; Fri, 26 Feb 2016 13:01:05 +0100 From: Arnd Bergmann To: Andrew Morton Cc: linux-arm-kernel@lists.infradead.org, Dave Hansen , linux-mm@kvack.org, Arnd Bergmann , Greg Kroah-Hartman , Jin Qian , linux-kernel@vger.kernel.org Subject: [PATCH] staging/goldfish: use 6-arg get_user_pages() Date: Fri, 26 Feb 2016 12:59:43 +0100 Message-Id: <1456488033-4044939-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:eAzG8Qm3AMWNBAjDNtjwYnmzTNYIfDkMRTB6jnic3wXfHNOx4K4 ofgsEex6ml9htticzkWIGL3netUAd2iSItz0fUUDj9GGZdxbgMVP2CP8W3iJbXuPHQQ/Oaw 5YojCLHGnPBga5G/alyEWXa8kTGoMHM8e4Tl9HwEGZCP550hE6WmZ9QLTOAnS4NmIu/4Kf+ vzaKXuWBqgd8GbHBhNX4A== X-UI-Out-Filterresults: notjunk:1; V01:K0:2kvwGk955Ig=:g4n7LWa9XVYFMyvxurGjxt tCZZ12tNyxT9enrURV+8uhYiuFZN3pBFVP9WP0cbGo9yxy/VJ0qjfil49RMp+//+iwrpCrw2x 5KmWbCte/xtIdhRQH3oKwBV6Afrk5MDpXoEJzvrGTobZU2EL/wSUBICCKAdGL7zI5SIavLDzW KFvU6ro5SXYpmT7Ty8rr3fCwSSebCfSQRxlNUp/5qJTG3qyaIn2WxHSBU+pdb/5mkoM5xz70j SPdDR+EKBl36BfZW5M/EmJSVesgvldr2I2mcKxaN6NqzRLCLnloUOfMxpKn7Eh8Dvu83FMUFN E+1nRZu8DZvgduNCbR1eRCyPluZhfQ3cNNV6t7vUNOrsVeO294WWloFvNgGkMfrJsSMGMVXdc /d5d3XTJTdAnN6vBqKXISA3n9zuUNPvS3qMzHd61XhabkFrzqyD9crB6NGxpGUikKBJByaMxW J/wAgevZ4XSSA2mU9Ay2RbzoeHmjCFmPSIcws8+Mr/J5/Mzy6qDYQ/W1j2HuMswdHADU/4NKZ SFPBNk4t8rvJjnlSsH3aLNKkTI4liKJ2lkaAEFEquBaXg53YxcJfuG1fheDb4mgBUpBCYv2oz Ma4DAikEfXB8ncGKFwCN25xefQ31YiY/7hXI62DctgwiZqA0qhlOdPjVt2lkYINlurimwoWxi TrA78d49I/7TCh+HaFcwq685F1Js3j/O8BHjLIJNR/l3oqw7ZeHRExcG5NSfzMeLAvRg= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After commit cde70140fed8 ("mm/gup: Overload get_user_pages() functions"), we get warning for this file, as it calls get_user_pages() with eight arguments after the change of the calling convention to use only six: drivers/platform/goldfish/goldfish_pipe.c: In function 'goldfish_pipe_read_write': drivers/platform/goldfish/goldfish_pipe.c:312:3: error: 'get_user_pages8' is deprecated [-Werror=deprecated-declarations] This removes the first two arguments, which are now the default. Signed-off-by: Arnd Bergmann --- The API change is currently only in the mm/pkeys branch of the tip tree, while the goldfish_pipe driver started using the old API in the staging/next branch. Andrew could pick it up into linux-mm in the meantime, or I can resend it at some later point if nobody else does the change after 4.6-rc1. --- drivers/platform/goldfish/goldfish_pipe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.7.0 diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c index 9973cebb4d6f..07462d79d040 100644 --- a/drivers/platform/goldfish/goldfish_pipe.c +++ b/drivers/platform/goldfish/goldfish_pipe.c @@ -309,8 +309,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer, * much memory to the process. */ down_read(¤t->mm->mmap_sem); - ret = get_user_pages(current, current->mm, address, 1, - !is_write, 0, &page, NULL); + ret = get_user_pages(address, 1, !is_write, 0, &page, NULL); up_read(¤t->mm->mmap_sem); if (ret < 0) break;