From 595e48b17deafe7e9f3335b76d01328befc52ca1 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 23 Feb 2017 01:27:00 +0000
Subject: [PATCH] media_build: add 4.10 patch

---
 .../media_build-02-add-to-backports.patch     |  3 ++-
 .../linux-250-fix-for-kernel-4.10.patch       | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 packages/linux-drivers/media_build/sources/backports/linux-250-fix-for-kernel-4.10.patch

diff --git a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch
index 1f3f1999e4..60afdda162 100644
--- a/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch
+++ b/packages/linux-drivers/media_build/patches/media_build-02-add-to-backports.patch
@@ -1,6 +1,6 @@
 --- a/backports/backports.txt
 +++ b/backports/backports.txt
-@@ -25,6 +25,14 @@
+@@ -25,6 +25,15 @@
  add pr_fmt.patch
  add debug.patch
  add drx39xxj.patch
@@ -12,6 +12,7 @@
 +add linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
 +add linux-062-imon_pad_ignore_diagonal.patch
 +add linux-240-pctv452e_kernel_oops_in_4.9.patch
++add linux-250-fix-for-kernel-4.10.patch
 
  [4.8.255]
  add v4.8_user_pages_flag.patch
diff --git a/packages/linux-drivers/media_build/sources/backports/linux-250-fix-for-kernel-4.10.patch b/packages/linux-drivers/media_build/sources/backports/linux-250-fix-for-kernel-4.10.patch
new file mode 100644
index 0000000000..f3d1cb2ec8
--- /dev/null
+++ b/packages/linux-drivers/media_build/sources/backports/linux-250-fix-for-kernel-4.10.patch
@@ -0,0 +1,21 @@
+mm: use vmf->address instead of of vmf->virtual_address
+drop at media_build bump
+taken from https://github.com/torvalds/linux/commit/1a29d85eb0f19b7d8271923d8917d7b4f5540b3e
+--- a/drivers/media/v4l2-core/videobuf-dma-sg.c
++++ b/drivers/media/v4l2-core/videobuf-dma-sg.c
+@@ -439,13 +439,12 @@ static int videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ 	struct page *page;
+ 
+ 	dprintk(3, "fault: fault @ %08lx [vma %08lx-%08lx]\n",
+-		(unsigned long)vmf->virtual_address,
+-		vma->vm_start, vma->vm_end);
++		vmf->address, vma->vm_start, vma->vm_end);
+ 
+ 	page = alloc_page(GFP_USER | __GFP_DMA32);
+ 	if (!page)
+ 		return VM_FAULT_OOM;
+-	clear_user_highpage(page, (unsigned long)vmf->virtual_address);
++	clear_user_highpage(page, vmf->address);
+ 	vmf->page = page;
+ 
+ 	return 0;