From patchwork Tue Jan 31 18:58:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 9548111 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 36C0460425 for ; Tue, 31 Jan 2017 18:58:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2977E27FE4 for ; Tue, 31 Jan 2017 18:58:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CFAB281A7; Tue, 31 Jan 2017 18:58:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9D62A27FE4 for ; Tue, 31 Jan 2017 18:58:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82E3A6E297; Tue, 31 Jan 2017 18:58:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.dudau.co.uk (dliviu.plus.com [80.229.23.120]) by gabe.freedesktop.org (Postfix) with ESMTP id A92EB6E297 for ; Tue, 31 Jan 2017 18:58:55 +0000 (UTC) Received: from mail.dudau.co.uk (bart.dudau.co.uk [192.168.14.2]) by smtp.dudau.co.uk (Postfix) with SMTP id 101AB411BB20; Tue, 31 Jan 2017 18:58:54 +0000 (GMT) Received: by mail.dudau.co.uk (sSMTP sendmail emulation); Tue, 31 Jan 2017 18:58:54 +0000 From: Liviu Dudau To: David Airlie , Russell King , Christian Gmeiner Subject: [PATCH 1/3] drm: armada: fix armada_gem_vm_fault() to match new signature. Date: Tue, 31 Jan 2017 18:58:47 +0000 Message-Id: <20170131185849.8297-1-liviu@dudau.co.uk> X-Mailer: git-send-email 2.11.0 Cc: Dave Jiang , LKML , Russell King , DRI devel , etnaviv@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") changes the signature of the .fault hook. Update the armada_gem_vm_fault() function to match. Fixes: 25d3db7600b8 (mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf) Cc: Dave Jiang Cc: Russell King Signed-off-by: Liviu Dudau --- drivers/gpu/drm/armada/armada_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index a293c8be232c..1ec0419003f3 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -14,8 +14,9 @@ #include #include "armada_ioctlP.h" -static int armada_gem_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) +static int armada_gem_vm_fault(struct vm_fault *vmf) { + struct vm_area_struct *vma = vmf->vma; struct armada_gem_object *obj = drm_to_armada_gem(vma->vm_private_data); unsigned long pfn = obj->phys_addr >> PAGE_SHIFT; int ret;