1 files changed, 10 insertions, 3 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index ae007462b7f6..6b8889da69a6 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -31,6 +31,7 @@
 #include <asm/tlbflush.h>
 #include <asm/shmparam.h>
 
+bool vmap_lazy_unmap __read_mostly = true;
 
 /*** Page table manipulation functions ***/
 
@@ -502,6 +503,9 @@ static unsigned long lazy_max_pages(void)
 {
         unsigned int log;
 
+        if (!vmap_lazy_unmap)
+                return 0;
+
         log = fls(num_online_cpus());
 
         return log * (32UL * 1024 * 1024 / PAGE_SIZE);
@@ -732,7 +736,7 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
                                         node, gfp_mask);
         if (unlikely(IS_ERR(va))) {
                 kfree(vb);
-                return ERR_PTR(PTR_ERR(va));
+                return ERR_CAST(va);
         }
 
         err = radix_tree_preload(gfp_mask);
@@ -2403,7 +2407,7 @@ static int s_show(struct seq_file *m, void *p)
                 seq_printf(m, " pages=%d", v->nr_pages);
 
         if (v->phys_addr)
-                seq_printf(m, " phys=%lx", v->phys_addr);
+                seq_printf(m, " phys=%llx", (unsigned long long)v->phys_addr);
 
         if (v->flags & VM_IOREMAP)
                 seq_printf(m, " ioremap");
@@ -2437,8 +2441,11 @@ static int vmalloc_open(struct inode *inode, struct file *file)
         unsigned int *ptr = NULL;
         int ret;
 
-        if (NUMA_BUILD)
+        if (NUMA_BUILD) {
                 ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);
+                if (ptr == NULL)
+                        return -ENOMEM;
+        }
         ret = seq_open(file, &vmalloc_op);
         if (!ret) {
                 struct seq_file *m = file->private_data;