From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Oct 2017 15:21:44 +0000 (+0200)
Subject: Merge 4.14-rc6 into char-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6fbf248a20d362a92de60beee9474faca0b54eee;p=linux.git

Merge 4.14-rc6 into char-misc-next

We want the driver fixes in here and this resolves a merge issue with
the binder driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

6fbf248a20d362a92de60beee9474faca0b54eee
diff --cc drivers/android/binder_alloc.c
index ed0c9dc792eb4,c2819a3d58a66..6f6f745605afc
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@@ -215,8 -215,8 +215,8 @@@ static int binder_update_page_range(str
  		}
  	}
  
- 	if (need_mm)
- 		mm = get_task_mm(alloc->tsk);
 -	if (!vma && need_mm && mmget_not_zero(alloc->vma_vm_mm))
++	if (need_mm && mmget_not_zero(alloc->vma_vm_mm))
+ 		mm = alloc->vma_vm_mm;
  
  	if (mm) {
  		down_write(&mm->mmap_sem);
@@@ -565,9 -560,10 +560,9 @@@ static void binder_delete_free_buffer(s
  		binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
  				   "%d: merge free, buffer %pK do not share page with %pK or %pK\n",
  				   alloc->pid, buffer->data,
- 				   prev->data, next->data);
+ 				   prev->data, next ? next->data : NULL);
  		binder_update_page_range(alloc, 0, buffer_start_page(buffer),
 -					 buffer_start_page(buffer) + PAGE_SIZE,
 -					 NULL);
 +					 buffer_start_page(buffer) + PAGE_SIZE);
  	}
  	list_del(&buffer->entry);
  	kfree(buffer);