diff options
Diffstat (limited to 'mm/percpu.c')
-rw-r--r-- | mm/percpu.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 998607adf6eb..847814b15233 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
@@ -1033,8 +1033,8 @@ fail_unlock: | |||
1033 | spin_unlock_irqrestore(&pcpu_lock, flags); | 1033 | spin_unlock_irqrestore(&pcpu_lock, flags); |
1034 | fail: | 1034 | fail: |
1035 | if (!is_atomic && warn_limit) { | 1035 | if (!is_atomic && warn_limit) { |
1036 | pr_warning("PERCPU: allocation failed, size=%zu align=%zu atomic=%d, %s\n", | 1036 | pr_warn("PERCPU: allocation failed, size=%zu align=%zu atomic=%d, %s\n", |
1037 | size, align, is_atomic, err); | 1037 | size, align, is_atomic, err); |
1038 | dump_stack(); | 1038 | dump_stack(); |
1039 | if (!--warn_limit) | 1039 | if (!--warn_limit) |
1040 | pr_info("PERCPU: limit reached, disable warning\n"); | 1040 | pr_info("PERCPU: limit reached, disable warning\n"); |
@@ -1723,7 +1723,7 @@ static int __init percpu_alloc_setup(char *str) | |||
1723 | pcpu_chosen_fc = PCPU_FC_PAGE; | 1723 | pcpu_chosen_fc = PCPU_FC_PAGE; |
1724 | #endif | 1724 | #endif |
1725 | else | 1725 | else |
1726 | pr_warning("PERCPU: unknown allocator %s specified\n", str); | 1726 | pr_warn("PERCPU: unknown allocator %s specified\n", str); |
1727 | 1727 | ||
1728 | return 0; | 1728 | return 0; |
1729 | } | 1729 | } |
@@ -2016,9 +2016,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, | |||
2016 | 2016 | ||
2017 | /* warn if maximum distance is further than 75% of vmalloc space */ | 2017 | /* warn if maximum distance is further than 75% of vmalloc space */ |
2018 | if (max_distance > VMALLOC_TOTAL * 3 / 4) { | 2018 | if (max_distance > VMALLOC_TOTAL * 3 / 4) { |
2019 | pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc " | 2019 | pr_warn("PERCPU: max_distance=0x%zx too large for vmalloc space 0x%lx\n", |
2020 | "space 0x%lx\n", max_distance, | 2020 | max_distance, VMALLOC_TOTAL); |
2021 | VMALLOC_TOTAL); | ||
2022 | #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK | 2021 | #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK |
2023 | /* and fail if we have fallback */ | 2022 | /* and fail if we have fallback */ |
2024 | rc = -EINVAL; | 2023 | rc = -EINVAL; |
@@ -2100,8 +2099,8 @@ int __init pcpu_page_first_chunk(size_t reserved_size, | |||
2100 | 2099 | ||
2101 | ptr = alloc_fn(cpu, PAGE_SIZE, PAGE_SIZE); | 2100 | ptr = alloc_fn(cpu, PAGE_SIZE, PAGE_SIZE); |
2102 | if (!ptr) { | 2101 | if (!ptr) { |
2103 | pr_warning("PERCPU: failed to allocate %s page " | 2102 | pr_warn("PERCPU: failed to allocate %s page for cpu%u\n", |
2104 | "for cpu%u\n", psize_str, cpu); | 2103 | psize_str, cpu); |
2105 | goto enomem; | 2104 | goto enomem; |
2106 | } | 2105 | } |
2107 | /* kmemleak tracks the percpu allocations separately */ | 2106 | /* kmemleak tracks the percpu allocations separately */ |