From patchwork Tue Jan 31 18:58:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 9548117 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 827B860425 for ; Tue, 31 Jan 2017 18:59:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7521427FE4 for ; Tue, 31 Jan 2017 18:59:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A3F7281A7; Tue, 31 Jan 2017 18:59:05 +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 070DB27FE4 for ; Tue, 31 Jan 2017 18:59:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A6776E6EF; Tue, 31 Jan 2017 18:59:03 +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 A53386E2C6 for ; Tue, 31 Jan 2017 18:58:57 +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 1CDA9411BB24; Tue, 31 Jan 2017 18:58:56 +0000 (GMT) Received: by mail.dudau.co.uk (sSMTP sendmail emulation); Tue, 31 Jan 2017 18:58:56 +0000 From: Liviu Dudau To: David Airlie , Russell King , Christian Gmeiner Subject: [PATCH 3/3] drm/omapdrm: Update omap_gem_fault() declaration to match definition. Date: Tue, 31 Jan 2017 18:58:49 +0000 Message-Id: <20170131185849.8297-3-liviu@dudau.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170131185849.8297-1-liviu@dudau.co.uk> References: <20170131185849.8297-1-liviu@dudau.co.uk> Cc: Dave Jiang , etnaviv@lists.freedesktop.org, DRI devel , LKML , Tomi Valkeinen 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") updated the omap_gem_fault() function signature without updating the header file with the declaration. Fixes: 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") Cc: Dave Jiang Cc: Tomi Valkeinen Signed-off-by: Liviu Dudau --- drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index 36d93ce84a29..65977982f15f 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h @@ -188,7 +188,7 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev, int omap_gem_mmap(struct file *filp, struct vm_area_struct *vma); int omap_gem_mmap_obj(struct drm_gem_object *obj, struct vm_area_struct *vma); -int omap_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); +int omap_gem_fault(struct vm_fault *vmf); int omap_gem_op_start(struct drm_gem_object *obj, enum omap_gem_op op); int omap_gem_op_finish(struct drm_gem_object *obj, enum omap_gem_op op); int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op);