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

Pull char/misc driver updates from Greg KH:
 "Here is the big pull request for char/misc drivers for 4.16-rc1.

  There's a lot of stuff in here. Three new driver subsystems were added
  for various types of hardware busses:

   - siox
   - slimbus
   - soundwire

  as well as a new vboxguest subsystem for the VirtualBox hypervisor
  drivers.

  There's also big updates from the FPGA subsystem, lots of Android
  binder fixes, the usual handful of hyper-v updates, and lots of other
  smaller driver updates.

  All of these have been in linux-next for a long time, with no reported
  issues"

* tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (155 commits)
  char: lp: use true or false for boolean values
  android: binder: use VM_ALLOC to get vm area
  android: binder: Use true and false for boolean values
  lkdtm: fix handle_irq_event symbol for INT_HW_IRQ_EN
  EISA: Delete error message for a failed memory allocation in eisa_probe()
  EISA: Whitespace cleanup
  misc: remove AVR32 dependencies
  virt: vbox: Add error mapping for VERR_INVALID_NAME and VERR_NO_MORE_FILES
  soundwire: Fix a signedness bug
  uio_hv_generic: fix new type mismatch warnings
  uio_hv_generic: fix type mismatch warnings
  auxdisplay: img-ascii-lcd: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
  uio_hv_generic: add rescind support
  uio_hv_generic: check that host supports monitor page
  uio_hv_generic: create send and receive buffers
  uio: document uio_hv_generic regions
  doc: fix documentation about uio_hv_generic
  vmbus: add monitor_id and subchannel_id to sysfs per channel
  vmbus: fix ABI documentation
  uio_hv_generic: use ISR callback method
  ...

1 files changed, 20 insertions, 9 deletions

diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index 6f6f745605af..5a426c877dfb 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -281,6 +281,9 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
                         goto err_vm_insert_page_failed;
                 }
 
+                if (index + 1 > alloc->pages_high)
+                        alloc->pages_high = index + 1;
+
                 trace_binder_alloc_page_end(alloc, index);
                 /* vm_insert_page does not seem to increment the refcount */
         }
@@ -324,11 +327,12 @@ err_no_vma:
         return vma ? -ENOMEM : -ESRCH;
 }
 
-struct binder_buffer *binder_alloc_new_buf_locked(struct binder_alloc *alloc,
-                                                  size_t data_size,
-                                                  size_t offsets_size,
-                                                  size_t extra_buffers_size,
-                                                  int is_async)
+static struct binder_buffer *binder_alloc_new_buf_locked(
+                                struct binder_alloc *alloc,
+                                size_t data_size,
+                                size_t offsets_size,
+                                size_t extra_buffers_size,
+                                int is_async)
 {
         struct rb_node *n = alloc->free_buffers.rb_node;
         struct binder_buffer *buffer;
@@ -666,7 +670,7 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,
                 goto err_already_mapped;
         }
 
-        area = get_vm_area(vma->vm_end - vma->vm_start, VM_IOREMAP);
+        area = get_vm_area(vma->vm_end - vma->vm_start, VM_ALLOC);
         if (area == NULL) {
                 ret = -ENOMEM;
                 failure_string = "get_vm_area";
@@ -853,6 +857,7 @@ void binder_alloc_print_pages(struct seq_file *m,
         }
         mutex_unlock(&alloc->mutex);
         seq_printf(m, "  pages: %d:%d:%d\n", active, lru, free);
+        seq_printf(m, "  pages high watermark: %zu\n", alloc->pages_high);
 }
 
 /**
@@ -1002,8 +1007,14 @@ void binder_alloc_init(struct binder_alloc *alloc)
         INIT_LIST_HEAD(&alloc->buffers);
 }
 
-void binder_alloc_shrinker_init(void)
+int binder_alloc_shrinker_init(void)
 {
-        list_lru_init(&binder_alloc_lru);
-        register_shrinker(&binder_shrinker);
+        int ret = list_lru_init(&binder_alloc_lru);
+
+        if (ret == 0) {
+                ret = register_shrinker(&binder_shrinker);
+                if (ret)
+                        list_lru_destroy(&binder_alloc_lru);
+        }
+        return ret;
 }