[PATCH 1/3] drm: armada: fix armada_gem_vm_fault() to match new signature.

From: Liviu Dudau
Date: Tue Jan 31 2017 - 14:08:32 EST


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 <dave.jiang@xxxxxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxx>
Signed-off-by: Liviu Dudau <liviu@xxxxxxxxxxx>
---
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 <drm/armada_drm.h>
#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;
--
2.11.0