From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752156AbdAaTIO (ORCPT ); Tue, 31 Jan 2017 14:08:14 -0500 Received: from dliviu.plus.com ([80.229.23.120]:52288 "EHLO smtp.dudau.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698AbdAaTIM (ORCPT ); Tue, 31 Jan 2017 14:08:12 -0500 X-Greylist: delayed 694 seconds by postgrey-1.27 at vger.kernel.org; Tue, 31 Jan 2017 14:08:12 EST From: Liviu Dudau To: David Airlie , Russell King , Christian Gmeiner Cc: etnaviv@lists.freedesktop.org, DRI devel , LKML , Liviu Dudau , Dave Jiang , Lucas Stach Subject: [PATCH 2/3] drm/etnaviv: Update etnaviv_gem_fault() declaration to match definition. Date: Tue, 31 Jan 2017 18:58:48 +0000 Message-Id: <20170131185849.8297-2-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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 25d3db7600b8 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") updated the etnaviv_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: Lucas Stach Cc: Russell King Cc: Christian Gmeiner Signed-off-by: Liviu Dudau --- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index c255eda40526..e41f38667c1c 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -73,7 +73,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_file *file); int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma); -int etnaviv_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); +int etnaviv_gem_fault(struct vm_fault *vmf); int etnaviv_gem_mmap_offset(struct drm_gem_object *obj, u64 *offset); struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj); void *etnaviv_gem_prime_vmap(struct drm_gem_object *obj); -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu Dudau Subject: [PATCH 2/3] drm/etnaviv: Update etnaviv_gem_fault() declaration to match definition. Date: Tue, 31 Jan 2017 18:58:48 +0000 Message-ID: <20170131185849.8297-2-liviu@dudau.co.uk> References: <20170131185849.8297-1-liviu@dudau.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp.dudau.co.uk (dliviu.plus.com [80.229.23.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CACA6E297 for ; Tue, 31 Jan 2017 18:58:56 +0000 (UTC) In-Reply-To: <20170131185849.8297-1-liviu@dudau.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie , Russell King , Christian Gmeiner Cc: Dave Jiang , etnaviv@lists.freedesktop.org, DRI devel , LKML List-Id: dri-devel@lists.freedesktop.org Q29tbWl0IDI1ZDNkYjc2MDBiOCAoIm1tLCBmczogcmVkdWNlIGZhdWx0LCBwYWdlX21rd3JpdGUs IGFuZCBwZm5fbWt3cml0ZQp0byB0YWtlIG9ubHkgdm1mIikgdXBkYXRlZCB0aGUgZXRuYXZpdl9n ZW1fZmF1bHQoKSBmdW5jdGlvbiBzaWduYXR1cmUKd2l0aG91dCB1cGRhdGluZyB0aGUgaGVhZGVy IGZpbGUgd2l0aCB0aGUgZGVjbGFyYXRpb24uCgpGaXhlczogMjVkM2RiNzYwMGI4ICgibW0sIGZz OiByZWR1Y2UgZmF1bHQsIHBhZ2VfbWt3cml0ZSwgYW5kIHBmbl9ta3dyaXRlIHRvIHRha2Ugb25s eSB2bWYiKQpDYzogRGF2ZSBKaWFuZyA8ZGF2ZS5qaWFuZ0BpbnRlbC5jb20+CkNjOiBMdWNhcyBT dGFjaCA8bC5zdGFjaEBwZW5ndXRyb25peC5kZT4KQ2M6IFJ1c3NlbGwgS2luZyA8bGludXgrZXRu YXZpdkBhcm1saW51eC5vcmcudWs+CkNjOiBDaHJpc3RpYW4gR21laW5lciA8Y2hyaXN0aWFuLmdt ZWluZXJAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBMaXZpdSBEdWRhdSA8bGl2aXVAZHVkYXUu Y28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9kcnYuaCB8IDIgKy0K IDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vZXRuYXZpdi9ldG5hdml2X2Rydi5oCmluZGV4IGMyNTVlZGE0MDUyNi4uZTQxZjM4NjY3YzFj IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZXRuYXZpdi9ldG5hdml2X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9ldG5hdml2L2V0bmF2aXZfZHJ2LmgKQEAgLTczLDcgKzczLDcgQEAg aW50IGV0bmF2aXZfaW9jdGxfZ2VtX3N1Ym1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lk ICpkYXRhLAogCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogCiBpbnQgZXRuYXZpdl9nZW1fbW1h cChzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEpOwotaW50IGV0 bmF2aXZfZ2VtX2ZhdWx0KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1fZmF1 bHQgKnZtZik7CitpbnQgZXRuYXZpdl9nZW1fZmF1bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpOwog aW50IGV0bmF2aXZfZ2VtX21tYXBfb2Zmc2V0KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCB1 NjQgKm9mZnNldCk7CiBzdHJ1Y3Qgc2dfdGFibGUgKmV0bmF2aXZfZ2VtX3ByaW1lX2dldF9zZ190 YWJsZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaik7CiB2b2lkICpldG5hdml2X2dlbV9wcmlt ZV92bWFwKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKTsKLS0gCjIuMTEuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==