Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus

[deliverable/linux.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 90520af7f18604ccd825d2595e6103dccbbf3f32..39c338896416bd9f70d197ec30ddd003d935c65e 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -463,8 +463,7 @@ overflow:
                goto retry;
        }
        if (printk_ratelimit())
-               printk(KERN_WARNING
-                       "vmap allocation for size %lu failed: "
+               pr_warn("vmap allocation for size %lu failed: "
                        "use vmalloc=<size> to increase size.\n", size);
        kfree(va);
        return ERR_PTR(-EBUSY);
@@ -2575,10 +2574,10 @@ static void show_numa_info(struct seq_file *m, struct vm_struct *v)
                if (!counters)
                        return;
 
-               /* Pair with smp_wmb() in clear_vm_uninitialized_flag() */
-               smp_rmb();
                if (v->flags & VM_UNINITIALIZED)
                        return;
+               /* Pair with smp_wmb() in clear_vm_uninitialized_flag() */
+               smp_rmb();
 
                memset(counters, 0, nr_node_ids * sizeof(unsigned int));