|
@@ -1033,8 +1033,8 @@ fail_unlock:
|
|
|
spin_unlock_irqrestore(&pcpu_lock, flags);
|
|
|
fail:
|
|
|
if (!is_atomic && warn_limit) {
|
|
|
- pr_warning("PERCPU: allocation failed, size=%zu align=%zu atomic=%d, %s\n",
|
|
|
- size, align, is_atomic, err);
|
|
|
+ pr_warn("PERCPU: allocation failed, size=%zu align=%zu atomic=%d, %s\n",
|
|
|
+ size, align, is_atomic, err);
|
|
|
dump_stack();
|
|
|
if (!--warn_limit)
|
|
|
pr_info("PERCPU: limit reached, disable warning\n");
|
|
@@ -1723,7 +1723,7 @@ static int __init percpu_alloc_setup(char *str)
|
|
|
pcpu_chosen_fc = PCPU_FC_PAGE;
|
|
|
#endif
|
|
|
else
|
|
|
- pr_warning("PERCPU: unknown allocator %s specified\n", str);
|
|
|
+ pr_warn("PERCPU: unknown allocator %s specified\n", str);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -2016,9 +2016,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
|
|
|
|
|
|
/* warn if maximum distance is further than 75% of vmalloc space */
|
|
|
if (max_distance > VMALLOC_TOTAL * 3 / 4) {
|
|
|
- pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc "
|
|
|
- "space 0x%lx\n", max_distance,
|
|
|
- VMALLOC_TOTAL);
|
|
|
+ pr_warn("PERCPU: max_distance=0x%zx too large for vmalloc space 0x%lx\n",
|
|
|
+ max_distance, VMALLOC_TOTAL);
|
|
|
#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
|
|
|
/* and fail if we have fallback */
|
|
|
rc = -EINVAL;
|
|
@@ -2100,8 +2099,8 @@ int __init pcpu_page_first_chunk(size_t reserved_size,
|
|
|
|
|
|
ptr = alloc_fn(cpu, PAGE_SIZE, PAGE_SIZE);
|
|
|
if (!ptr) {
|
|
|
- pr_warning("PERCPU: failed to allocate %s page "
|
|
|
- "for cpu%u\n", psize_str, cpu);
|
|
|
+ pr_warn("PERCPU: failed to allocate %s page for cpu%u\n",
|
|
|
+ psize_str, cpu);
|
|
|
goto enomem;
|
|
|
}
|
|
|
/* kmemleak tracks the percpu allocations separately */
|