Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3bafbbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: fix compile warnings
parents 25d59158 1a0c3298

mm/percpu.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1870,13 +1870,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