Merge branch 'akpm' (incoming from Andrew)

[karo-tx-linux.git] / mm / percpu.c

diff --git a/mm/percpu.c b/mm/percpu.c
index 65fd8a749712a77feb4abadf1a9b53d5bf377768..036cfe07050f65eee962f51e6223321f9e01e132 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1689,10 +1689,10 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
        max_distance += ai->unit_size;
 
        /* warn if maximum distance is further than 75% of vmalloc space */
-       if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) {
+       if (max_distance > VMALLOC_TOTAL * 3 / 4) {
                pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc "
                           "space 0x%lx\n", max_distance,
-                          (unsigned long)(VMALLOC_END - VMALLOC_START));
+                          VMALLOC_TOTAL);
 #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
                /* and fail if we have fallback */
                rc = -EINVAL;