Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc updates from Greg KH:
 "Here is the big set of char/misc and other driver subsystem patches
  for 4.15-rc1.

  There are small changes all over here, hyperv driver updates, pcmcia
  driver updates, w1 driver updats, vme driver updates, nvmem driver
  updates, and lots of other little one-off driver updates as well. The
  shortlog has the full details.

  All of these have been in linux-next for quite a while with no
  reported issues"

* tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (90 commits)
  VME: Return -EBUSY when DMA list in use
  w1: keep balance of mutex locks and refcnts
  MAINTAINERS: Update VME subsystem tree.
  nvmem: sunxi-sid: add support for A64/H5's SID controller
  nvmem: imx-ocotp: Update module description
  nvmem: imx-ocotp: Enable i.MX7D OTP write support
  nvmem: imx-ocotp: Add i.MX7D timing write clock setup support
  nvmem: imx-ocotp: Move i.MX6 write clock setup to dedicated function
  nvmem: imx-ocotp: Add support for banked OTP addressing
  nvmem: imx-ocotp: Pass parameters via a struct
  nvmem: imx-ocotp: Restrict OTP write to IMX6 processors
  nvmem: uniphier: add UniPhier eFuse driver
  dt-bindings: nvmem: add description for UniPhier eFuse
  nvmem: set nvmem->owner to nvmem->dev->driver->owner if unset
  nvmem: qfprom: fix different address space warnings of sparse
  nvmem: mtk-efuse: fix different address space warnings of sparse
  nvmem: mtk-efuse: use stack for nvmem_config instead of malloc'ing it
  nvmem: imx-iim: use stack for nvmem_config instead of malloc'ing it
  thunderbolt: tb: fix use after free in tb_activate_pcie_devices
  MAINTAINERS: Add git tree for Thunderbolt development
  ...

2 files changed, 9 insertions, 11 deletions

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 7255f94ded30..a73596a4f804 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2192,7 +2192,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
                                                      off_start,
                                                      offp - off_start);
                         if (!parent) {
-                                pr_err("transaction release %d bad parent offset",
+                                pr_err("transaction release %d bad parent offset\n",
                                        debug_id);
                                 continue;
                         }
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index c2819a3d58a6..6f6f745605af 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -186,12 +186,12 @@ struct binder_buffer *binder_alloc_prepare_to_free(struct binder_alloc *alloc,
 }
 
 static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
-                                    void *start, void *end,
-                                    struct vm_area_struct *vma)
+                                    void *start, void *end)
 {
         void *page_addr;
         unsigned long user_page_addr;
         struct binder_lru_page *page;
+        struct vm_area_struct *vma = NULL;
         struct mm_struct *mm = NULL;
         bool need_mm = false;
 
@@ -215,7 +215,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
                 }
         }
 
-        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) {
@@ -437,7 +437,7 @@ struct binder_buffer *binder_alloc_new_buf_locked(struct binder_alloc *alloc,
         if (end_page_addr > has_page_addr)
                 end_page_addr = has_page_addr;
         ret = binder_update_page_range(alloc, 1,
-            (void *)PAGE_ALIGN((uintptr_t)buffer->data), end_page_addr, NULL);
+            (void *)PAGE_ALIGN((uintptr_t)buffer->data), end_page_addr);
         if (ret)
                 return ERR_PTR(ret);
 
@@ -478,7 +478,7 @@ struct binder_buffer *binder_alloc_new_buf_locked(struct binder_alloc *alloc,
 err_alloc_buf_struct_failed:
         binder_update_page_range(alloc, 0,
                                  (void *)PAGE_ALIGN((uintptr_t)buffer->data),
-                                 end_page_addr, NULL);
+                                 end_page_addr);
         return ERR_PTR(-ENOMEM);
 }
 
@@ -562,8 +562,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc,
                                    alloc->pid, buffer->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);
@@ -600,8 +599,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
 
         binder_update_page_range(alloc, 0,
                 (void *)PAGE_ALIGN((uintptr_t)buffer->data),
-                (void *)(((uintptr_t)buffer->data + buffer_size) & PAGE_MASK),
-                NULL);
+                (void *)(((uintptr_t)buffer->data + buffer_size) & PAGE_MASK));
 
         rb_erase(&buffer->rb_node, &alloc->allocated_buffers);
         buffer->free = 1;
@@ -984,7 +982,7 @@ binder_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
         return ret;
 }
 
-struct shrinker binder_shrinker = {
+static struct shrinker binder_shrinker = {
         .count_objects = binder_shrink_count,
         .scan_objects = binder_shrink_scan,
         .seeks = DEFAULT_SEEKS,