|
@@ -1961,7 +1961,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
|
|
|
void *base = (void *)ULONG_MAX;
|
|
|
void **areas = NULL;
|
|
|
struct pcpu_alloc_info *ai;
|
|
|
- size_t size_sum, areas_size, max_distance;
|
|
|
+ size_t size_sum, areas_size;
|
|
|
+ unsigned long max_distance;
|
|
|
int group, i, rc;
|
|
|
|
|
|
ai = pcpu_build_alloc_info(reserved_size, dyn_size, atom_size,
|
|
@@ -2023,17 +2024,18 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
|
|
|
}
|
|
|
|
|
|
/* base address is now known, determine group base offsets */
|
|
|
- max_distance = 0;
|
|
|
+ i = 0;
|
|
|
for (group = 0; group < ai->nr_groups; group++) {
|
|
|
ai->groups[group].base_offset = areas[group] - base;
|
|
|
- max_distance = max_t(size_t, max_distance,
|
|
|
- ai->groups[group].base_offset);
|
|
|
+ if (areas[group] > areas[i])
|
|
|
+ i = group;
|
|
|
}
|
|
|
- max_distance += ai->unit_size;
|
|
|
+ max_distance = ai->groups[i].base_offset +
|
|
|
+ ai->unit_size * ai->groups[i].nr_units;
|
|
|
|
|
|
/* warn if maximum distance is further than 75% of vmalloc space */
|
|
|
if (max_distance > VMALLOC_TOTAL * 3 / 4) {
|
|
|
- pr_warn("max_distance=0x%zx too large for vmalloc space 0x%lx\n",
|
|
|
+ pr_warn("max_distance=0x%lx 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 */
|