summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-10-12 17:14:18 +0900
committerTejun Heo <tj@kernel.org>2009-10-12 17:14:18 +0900
commitb7a4c946d0dfa91c28029756e8861eaa691fbbc3 (patch)
tree5a7c2b6b4bbef05cebd13b4e8a7a3bc2e4e2da1b
parente800879d50c5a528d40191528557b1bdfbccbd42 (diff)
parent1a0c3298d6c6bfc357c38772e7f32d193c60c77d (diff)
Merge branch 'for-linus' into for-next
-rw-r--r--mm/percpu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index e4e08b87b77..ec158bb5f86 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1868,13 +1868,14 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, ssize_t dyn_size,
max_distance = 0;
for (group = 0; group < ai->nr_groups; group++) {
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;
/* warn if maximum distance is further than 75% of vmalloc space */
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",
max_distance, VMALLOC_END - VMALLOC_START);
#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK