Merge branch 'akpm' (patchbomb from Andrew) into next

Merge misc updates from Andrew Morton:

 - a few fixes for 3.16.  Cc'ed to stable so they'll get there somehow.

 - various misc fixes and cleanups

 - most of the ocfs2 queue.  Review is slow...

 - most of MM.  The MM queue is pretty huge this time, but not much in
   the way of feature work.

 - some tweaks under kernel/

 - printk maintenance work

 - updates to lib/

 - checkpatch updates

 - tweaks to init/

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (276 commits)
  fs/autofs4/dev-ioctl.c: add __init to autofs_dev_ioctl_init
  fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul
  init/main.c: remove an ifdef
  kthreads: kill CLONE_KERNEL, change kernel_thread(kernel_init) to avoid CLONE_SIGHAND
  init/main.c: add initcall_blacklist kernel parameter
  init/main.c: don't use pr_debug()
  fs/binfmt_flat.c: make old_reloc() static
  fs/binfmt_elf.c: fix bool assignements
  fs/efs: convert printk(KERN_DEBUG to pr_debug
  fs/efs: add pr_fmt / use __func__
  fs/efs: convert printk to pr_foo()
  scripts/checkpatch.pl: device_initcall is not the only __initcall substitute
  checkpatch: check stable email address
  checkpatch: warn on unnecessary void function return statements
  checkpatch: prefer kstrto<foo> to sscanf(buf, "%<lhuidx>", &bar);
  checkpatch: add warning for kmalloc/kzalloc with multiply
  checkpatch: warn on #defines ending in semicolon
  checkpatch: make --strict a default for files in drivers/net and net/
  checkpatch: always warn on missing blank line after variable declaration block
  checkpatch: fix wildcard DT compatible string checking
  ...

9 files changed, 92 insertions, 49 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 4b7b4522b64f..23b8726962af 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -258,7 +258,7 @@ endchoice
 
 config CMA_ALIGNMENT
         int "Maximum PAGE_SIZE order of alignment for contiguous buffers"
-        range 4 9
+        range 4 12
         default 8
         help
           DMA mapping framework by default aligns all buffers to the smallest
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index c34ec3364243..83969f8c5727 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -60,11 +60,22 @@ struct cma *dma_contiguous_default_area;
  */
 static const phys_addr_t size_bytes = CMA_SIZE_MBYTES * SZ_1M;
 static phys_addr_t size_cmdline = -1;
+static phys_addr_t base_cmdline;
+static phys_addr_t limit_cmdline;
 
 static int __init early_cma(char *p)
 {
         pr_debug("%s(%s)\n", __func__, p);
         size_cmdline = memparse(p, &p);
+        if (*p != '@')
+                return 0;
+        base_cmdline = memparse(p + 1, &p);
+        if (*p != '-') {
+                limit_cmdline = base_cmdline + size_cmdline;
+                return 0;
+        }
+        limit_cmdline = memparse(p + 1, &p);
+
         return 0;
 }
 early_param("cma", early_cma);
@@ -108,11 +119,18 @@ static inline __maybe_unused phys_addr_t cma_early_percent_memory(void)
 void __init dma_contiguous_reserve(phys_addr_t limit)
 {
         phys_addr_t selected_size = 0;
+        phys_addr_t selected_base = 0;
+        phys_addr_t selected_limit = limit;
+        bool fixed = false;
 
         pr_debug("%s(limit %08lx)\n", __func__, (unsigned long)limit);
 
         if (size_cmdline != -1) {
                 selected_size = size_cmdline;
+                selected_base = base_cmdline;
+                selected_limit = min_not_zero(limit_cmdline, limit);
+                if (base_cmdline + size_cmdline == limit_cmdline)
+                        fixed = true;
         } else {
 #ifdef CONFIG_CMA_SIZE_SEL_MBYTES
                 selected_size = size_bytes;
@@ -129,10 +147,12 @@ void __init dma_contiguous_reserve(phys_addr_t limit)
                 pr_debug("%s: reserving %ld MiB for global area\n", __func__,
                          (unsigned long)selected_size / SZ_1M);
 
-                dma_contiguous_reserve_area(selected_size, 0, limit,
-                                            &dma_contiguous_default_area);
+                dma_contiguous_reserve_area(selected_size, selected_base,
+                                            selected_limit,
+                                            &dma_contiguous_default_area,
+                                            fixed);
         }
-};
+}
 
 static DEFINE_MUTEX(cma_mutex);
 
@@ -189,15 +209,20 @@ core_initcall(cma_init_reserved_areas);
  * @base: Base address of the reserved area optional, use 0 for any
  * @limit: End address of the reserved memory (optional, 0 for any).
  * @res_cma: Pointer to store the created cma region.
+ * @fixed: hint about where to place the reserved area
  *
  * This function reserves memory from early allocator. It should be
  * called by arch specific code once the early allocator (memblock or bootmem)
  * has been activated and all other subsystems have already allocated/reserved
  * memory. This function allows to create custom reserved areas for specific
  * devices.
+ *
+ * If @fixed is true, reserve contiguous area at exactly @base.  If false,
+ * reserve in range from @base to @limit.
  */
 int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
-                                       phys_addr_t limit, struct cma **res_cma)
+                                       phys_addr_t limit, struct cma **res_cma,
+                                       bool fixed)
 {
         struct cma *cma = &cma_areas[cma_area_count];
         phys_addr_t alignment;
@@ -223,18 +248,15 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
         limit &= ~(alignment - 1);
 
         /* Reserve memory */
-        if (base) {
+        if (base && fixed) {
                 if (memblock_is_region_reserved(base, size) ||
                     memblock_reserve(base, size) < 0) {
                         ret = -EBUSY;
                         goto err;
                 }
         } else {
-                /*
-                 * Use __memblock_alloc_base() since
-                 * memblock_alloc_base() panic()s.
-                 */
-                phys_addr_t addr = __memblock_alloc_base(size, alignment, limit);
+                phys_addr_t addr = memblock_alloc_range(size, alignment, base,
+                                                        limit);
                 if (!addr) {
                         ret = -ENOMEM;
                         goto err;
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index bece691cb5d9..89f752dd8465 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -118,16 +118,6 @@ static ssize_t show_mem_start_phys_index(struct device *dev,
         return sprintf(buf, "%08lx\n", phys_index);
 }
 
-static ssize_t show_mem_end_phys_index(struct device *dev,
-                        struct device_attribute *attr, char *buf)
-{
-        struct memory_block *mem = to_memory_block(dev);
-        unsigned long phys_index;
-
-        phys_index = mem->end_section_nr / sections_per_block;
-        return sprintf(buf, "%08lx\n", phys_index);
-}
-
 /*
  * Show whether the section of memory is likely to be hot-removable
  */
@@ -384,7 +374,6 @@ static ssize_t show_phys_device(struct device *dev,
 }
 
 static DEVICE_ATTR(phys_index, 0444, show_mem_start_phys_index, NULL);
-static DEVICE_ATTR(end_phys_index, 0444, show_mem_end_phys_index, NULL);
 static DEVICE_ATTR(state, 0644, show_mem_state, store_mem_state);
 static DEVICE_ATTR(phys_device, 0444, show_phys_device, NULL);
 static DEVICE_ATTR(removable, 0444, show_mem_removable, NULL);
@@ -529,7 +518,6 @@ struct memory_block *find_memory_block(struct mem_section *section)
 
 static struct attribute *memory_memblk_attrs[] = {
         &dev_attr_phys_index.attr,
-        &dev_attr_end_phys_index.attr,
         &dev_attr_state.attr,
         &dev_attr_phys_device.attr,
         &dev_attr_removable.attr,
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index e73b85cf0756..c7d138eca731 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -200,11 +200,11 @@ static int copy_to_brd_setup(struct brd_device *brd, sector_t sector, size_t n)
 
         copy = min_t(size_t, n, PAGE_SIZE - offset);
         if (!brd_insert_page(brd, sector))
-                return -ENOMEM;
+                return -ENOSPC;
         if (copy < n) {
                 sector += copy >> SECTOR_SHIFT;
                 if (!brd_insert_page(brd, sector))
-                        return -ENOMEM;
+                        return -ENOSPC;
         }
         return 0;
 }
@@ -360,6 +360,15 @@ out:
         bio_endio(bio, err);
 }
 
+static int brd_rw_page(struct block_device *bdev, sector_t sector,
+                       struct page *page, int rw)
+{
+        struct brd_device *brd = bdev->bd_disk->private_data;
+        int err = brd_do_bvec(brd, page, PAGE_CACHE_SIZE, 0, rw, sector);
+        page_endio(page, rw & WRITE, err);
+        return err;
+}
+
 #ifdef CONFIG_BLK_DEV_XIP
 static int brd_direct_access(struct block_device *bdev, sector_t sector,
                         void **kaddr, unsigned long *pfn)
@@ -375,7 +384,7 @@ static int brd_direct_access(struct block_device *bdev, sector_t sector,
                 return -ERANGE;
         page = brd_insert_page(brd, sector);
         if (!page)
-                return -ENOMEM;
+                return -ENOSPC;
         *kaddr = page_address(page);
         *pfn = page_to_pfn(page);
 
@@ -419,6 +428,7 @@ static int brd_ioctl(struct block_device *bdev, fmode_t mode,
 
 static const struct block_device_operations brd_fops = {
         .owner =                THIS_MODULE,
+        .rw_page =              brd_rw_page,
         .ioctl =                brd_ioctl,
 #ifdef CONFIG_BLK_DEV_XIP
         .direct_access =        brd_direct_access,
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 9849b5233bf4..48eccb350180 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -572,10 +572,10 @@ static void zram_bio_discard(struct zram *zram, u32 index,
          * skipping this logical block is appropriate here.
          */
         if (offset) {
-                if (n < offset)
+                if (n <= (PAGE_SIZE - offset))
                         return;
 
-                n -= offset;
+                n -= (PAGE_SIZE - offset);
                 index++;
         }
 
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/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index f256ffc02e29..6bb32773c3ac 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -39,6 +39,7 @@
 #include <linux/dmi.h>
 #include <linux/pci-ats.h>
 #include <linux/memblock.h>
+#include <linux/dma-contiguous.h>
 #include <asm/irq_remapping.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
@@ -3193,7 +3194,7 @@ static void *intel_alloc_coherent(struct device *dev, size_t size,
                                   dma_addr_t *dma_handle, gfp_t flags,
                                   struct dma_attrs *attrs)
 {
-        void *vaddr;
+        struct page *page = NULL;
         int order;
 
         size = PAGE_ALIGN(size);
@@ -3208,17 +3209,31 @@ static void *intel_alloc_coherent(struct device *dev, size_t size,
                         flags |= GFP_DMA32;
         }
 
-        vaddr = (void *)__get_free_pages(flags, order);
-        if (!vaddr)
+        if (flags & __GFP_WAIT) {
+                unsigned int count = size >> PAGE_SHIFT;
+
+                page = dma_alloc_from_contiguous(dev, count, order);
+                if (page && iommu_no_mapping(dev) &&
+                    page_to_phys(page) + size > dev->coherent_dma_mask) {
+                        dma_release_from_contiguous(dev, page, count);
+                        page = NULL;
+                }
+        }
+
+        if (!page)
+                page = alloc_pages(flags, order);
+        if (!page)
                 return NULL;
-        memset(vaddr, 0, size);
+        memset(page_address(page), 0, size);
 
-        *dma_handle = __intel_map_single(dev, virt_to_bus(vaddr), size,
+        *dma_handle = __intel_map_single(dev, page_to_phys(page), size,
                                          DMA_BIDIRECTIONAL,
                                          dev->coherent_dma_mask);
         if (*dma_handle)
-                return vaddr;
-        free_pages((unsigned long)vaddr, order);
+                return page_address(page);
+        if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
+                __free_pages(page, order);
+
         return NULL;
 }
 
@@ -3226,12 +3241,14 @@ static void intel_free_coherent(struct device *dev, size_t size, void *vaddr,
                                 dma_addr_t dma_handle, struct dma_attrs *attrs)
 {
         int order;
+        struct page *page = virt_to_page(vaddr);
 
         size = PAGE_ALIGN(size);
         order = get_order(size);
 
         intel_unmap_page(dev, dma_handle, size, DMA_BIDIRECTIONAL, NULL);
-        free_pages((unsigned long)vaddr, order);
+        if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
+                __free_pages(page, order);
 }
 
 static void intel_unmap_sg(struct device *dev, struct scatterlist *sglist,
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c
index 43926cd25ae8..5066a7ef7b6c 100644
--- a/drivers/nubus/nubus.c
+++ b/drivers/nubus/nubus.c
@@ -473,7 +473,7 @@ static struct nubus_dev* __init
         if (slot == 0 && (unsigned long)dir.base % 2)
                 dir.base += 1;
         
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_DEBUG "nubus_get_functional_resource: parent is 0x%p, dir is 0x%p\n",
                        parent->base, dir.base);
 
@@ -568,7 +568,7 @@ static int __init nubus_get_vidnames(struct nubus_board* board,
 
         printk(KERN_INFO "    video modes supported:\n");
         nubus_get_subdir(parent, &dir);
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_DEBUG "nubus_get_vidnames: parent is 0x%p, dir is 0x%p\n",
                        parent->base, dir.base);
 
@@ -629,7 +629,7 @@ static int __init nubus_get_vendorinfo(struct nubus_board* board,
 
         printk(KERN_INFO "    vendor info:\n");
         nubus_get_subdir(parent, &dir);
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_DEBUG "nubus_get_vendorinfo: parent is 0x%p, dir is 0x%p\n",
                        parent->base, dir.base);
 
@@ -654,7 +654,7 @@ static int __init nubus_get_board_resource(struct nubus_board* board, int slot,
         struct nubus_dirent ent;
         
         nubus_get_subdir(parent, &dir);
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_DEBUG "nubus_get_board_resource: parent is 0x%p, dir is 0x%p\n",
                        parent->base, dir.base);
 
@@ -753,19 +753,19 @@ static void __init nubus_find_rom_dir(struct nubus_board* board)
         if (nubus_readdir(&dir, &ent) == -1)
                 goto badrom;
 
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_INFO "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
         /* This one takes us to where we want to go. */
         if (nubus_readdir(&dir, &ent) == -1) 
                 goto badrom;
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
         nubus_get_subdir(&ent, &dir);
 
         /* Resource ID 01, also an "Unknown Macintosh" */
         if (nubus_readdir(&dir, &ent) == -1) 
                 goto badrom;
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
 
         /* FIXME: the first one is *not* always the right one.  We
@@ -780,7 +780,7 @@ static void __init nubus_find_rom_dir(struct nubus_board* board)
            path to that address... */
         if (nubus_readdir(&dir, &ent) == -1)
                 goto badrom;
-        if (console_loglevel >= 10)
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
                 printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
         
         /* Bwahahahaha... */
@@ -816,7 +816,7 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes)
         board->fblock = rp;
 
         /* Dump the format block for debugging purposes */
-        if (console_loglevel >= 10) {
+        if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) {
                 int i;
                 printk(KERN_DEBUG "Slot %X, format block at 0x%p\n",
                        slot, rp);
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index ce396ecdf412..b767a64e49d9 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -88,7 +88,7 @@ static void sysrq_handle_loglevel(int key)
         int i;
 
         i = key - '0';
-        console_loglevel = 7;
+        console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
         printk("Loglevel set to %d\n", i);
         console_loglevel = i;
 }
@@ -343,7 +343,7 @@ static void send_sig_all(int sig)
 static void sysrq_handle_term(int key)
 {
         send_sig_all(SIGTERM);
-        console_loglevel = 8;
+        console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
 }
 static struct sysrq_key_op sysrq_term_op = {
         .handler        = sysrq_handle_term,
@@ -387,7 +387,7 @@ static struct sysrq_key_op sysrq_thaw_op = {
 static void sysrq_handle_kill(int key)
 {
         send_sig_all(SIGKILL);
-        console_loglevel = 8;
+        console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
 }
 static struct sysrq_key_op sysrq_kill_op = {
         .handler        = sysrq_handle_kill,
@@ -520,7 +520,7 @@ void __handle_sysrq(int key, bool check_mask)
          * routing in the consumers of /proc/kmsg.
          */
         orig_log_level = console_loglevel;
-        console_loglevel = 7;
+        console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
         printk(KERN_INFO "SysRq : ");
 
         op_p = __sysrq_get_key_op(key);