Skip to content

L
linux-davinci
Commit b7a4c946 authored by Tejun Heo's avatar Tejun Heo
Browse files
Options

Merge branch 'for-linus' into for-next

parents e800879d 1a0c3298
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
mm/percpu.c
View file @ b7a4c946
...@@ -1868,13 +1868,14 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, ssize_t dyn_size, ...@@ -1868,13 +1868,14 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, ssize_t dyn_size,
max_distance = 0; max_distance = 0;
for (group = 0; group < ai->nr_groups; group++) { for (group = 0; group < ai->nr_groups; group++) {
ai->groups[group].base_offset = areas[group] - base; ai->groups[group].base_offset = areas[group] - base;
max_distance = max(max_distance, ai->groups[group].base_offset); max_distance = max_t(size_t, max_distance,
ai->groups[group].base_offset);
} }
max_distance += ai->unit_size; max_distance += ai->unit_size;
/* warn if maximum distance is further than 75% of vmalloc space */ /* warn if maximum distance is further than 75% of vmalloc space */
if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) { if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) {
pr_warning("PERCPU: max_distance=0x%lx too large for vmalloc " pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc "
"space 0x%lx\n", "space 0x%lx\n",
max_distance, VMALLOC_END - VMALLOC_START); max_distance, VMALLOC_END - VMALLOC_START);
#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment