Merge branch 'next' (accumulated 3.16 merge window patches) into master

Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...

6 files changed, 14 insertions, 18 deletions

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index c2676b5908d9..ec5c3f4cdd01 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -156,7 +156,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
          */
         if ((vblrc > 0) && (abs64(diff_ns) > 1000000)) {
                 atomic_inc(&dev->vblank[crtc].count);
-                smp_mb__after_atomic_inc();
+                smp_mb__after_atomic();
         }
 
         /* Invalidate all timestamps while vblank irq's are off. */
@@ -864,9 +864,9 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
                 vblanktimestamp(dev, crtc, tslot) = t_vblank;
         }
 
-        smp_mb__before_atomic_inc();
+        smp_mb__before_atomic();
         atomic_add(diff, &dev->vblank[crtc].count);
-        smp_mb__after_atomic_inc();
+        smp_mb__after_atomic();
 }
 
 /**
@@ -1330,9 +1330,9 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
                 /* Increment cooked vblank count. This also atomically commits
                  * the timestamp computed above.
                  */
-                smp_mb__before_atomic_inc();
+                smp_mb__before_atomic();
                 atomic_inc(&dev->vblank[crtc].count);
-                smp_mb__after_atomic_inc();
+                smp_mb__after_atomic();
         } else {
                 DRM_DEBUG("crtc %d: Redundant vblirq ignored. diff_ns = %d\n",
                           crtc, (int) diff_ns);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 6c1885eedfdf..800158714473 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -467,14 +467,17 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,
                 goto err_free;
         }
 
+        down_read(&current->mm->mmap_sem);
         vma = find_vma(current->mm, userptr);
         if (!vma) {
+                up_read(&current->mm->mmap_sem);
                 DRM_ERROR("failed to get vm region.\n");
                 ret = -EFAULT;
                 goto err_free_pages;
         }
 
         if (vma->vm_end < userptr + size) {
+                up_read(&current->mm->mmap_sem);
                 DRM_ERROR("vma is too small.\n");
                 ret = -EFAULT;
                 goto err_free_pages;
@@ -482,6 +485,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,
 
         g2d_userptr->vma = exynos_gem_get_vma(vma);
         if (!g2d_userptr->vma) {
+                up_read(&current->mm->mmap_sem);
                 DRM_ERROR("failed to copy vma.\n");
                 ret = -ENOMEM;
                 goto err_free_pages;
@@ -492,10 +496,12 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev,
         ret = exynos_gem_get_pages_from_userptr(start & PAGE_MASK,
                                                 npages, pages, vma);
         if (ret < 0) {
+                up_read(&current->mm->mmap_sem);
                 DRM_ERROR("failed to get user pages from userptr.\n");
                 goto err_put_vma;
         }
 
+        up_read(&current->mm->mmap_sem);
         g2d_userptr->pages = pages;
 
         sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 09312b877470..3d78144387ac 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -284,7 +284,7 @@ static struct exynos_drm_ippdrv *ipp_find_drv_by_handle(u32 prop_id)
         /*
          * This case is search ipp driver by prop_id handle.
          * sometimes, ipp subsystem find driver by prop_id.
-         * e.g PAUSE state, queue buf, command contro.
+         * e.g PAUSE state, queue buf, command control.
          */
         list_for_each_entry(ippdrv, &exynos_drm_ippdrv_list, drv_list) {
                 DRM_DEBUG_KMS("count[%d]ippdrv[0x%x]\n", count++, (int)ippdrv);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index f98ba4e6e70b..0b99de95593b 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2157,7 +2157,7 @@ static void i915_error_work_func(struct work_struct *work)
                          * updates before
                          * the counter increment.
                          */
-                        smp_mb__before_atomic_inc();
+                        smp_mb__before_atomic();
                         atomic_inc(&dev_priv->gpu_error.reset_counter);
 
                         kobject_uevent_env(&dev->primary->kdev->kobj,
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 630f6e84fc01..2c1e4aad7da3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -31,7 +31,6 @@
  */
 
 #include <linux/backlight.h>
-#include <linux/acpi.h>
 
 #include "nouveau_drm.h"
 #include "nouveau_reg.h"
@@ -222,14 +221,6 @@ nouveau_backlight_init(struct drm_device *dev)
         struct nouveau_device *device = nv_device(drm->device);
         struct drm_connector *connector;
 
-#ifdef CONFIG_ACPI
-        if (acpi_video_backlight_support()) {
-                NV_INFO(drm, "ACPI backlight interface available, "
-                             "not registering our own\n");
-                return 0;
-        }
-#endif
-
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS &&
                     connector->connector_type != DRM_MODE_CONNECTOR_eDP)
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index f5ae57406f34..afdf383f630a 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -283,7 +283,7 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
 int udl_driver_load(struct drm_device *dev, unsigned long flags)
 {
         struct udl_device *udl;
-        int ret;
+        int ret = -ENOMEM;
 
         DRM_DEBUG("\n");
         udl = kzalloc(sizeof(struct udl_device), GFP_KERNEL);
@@ -299,7 +299,6 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags)
         }
 
         if (!udl_alloc_urb_list(dev, WRITES_IN_FLIGHT, MAX_TRANSFER)) {
-                ret = -ENOMEM;
                 DRM_ERROR("udl_alloc_urb_list failed\n");
                 goto err;
         }