From a3dfae6463aa77a3e8c5fa84fa83c898092b0ed2 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 18 Apr 2017 06:36:59 +0100 Subject: [PATCH] media_build: drop linux-250-fix-for-kernel-4.10.patch --- .../media_build-02-add-to-backports.patch | 3 +-- .../linux-250-fix-for-kernel-4.10.patch | 21 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete 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 772398e594..b3765f1132 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,13 @@ +@@ -25,6 +25,12 @@ add pr_fmt.patch add debug.patch add drx39xxj.patch @@ -10,7 +10,6 @@ +add linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch +add linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch +add linux-062-imon_pad_ignore_diagonal.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 deleted file mode 100644 index f3d1cb2ec8..0000000000 --- a/packages/linux-drivers/media_build/sources/backports/linux-250-fix-for-kernel-4.10.patch +++ /dev/null @@ -1,21 +0,0 @@ -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;