summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-10-04 09:31:05 +0900
committerTejun Heo <tj@kernel.org>2009-10-12 17:04:42 +0900
commit1a0c3298d6c6bfc357c38772e7f32d193c60c77d (patch)
treedc39e4615cb321689176b75b6ddb6bf70c7ff569
parentf2badb0c950ed308be9b321203b9c8d341690cd4 (diff)
downloadop-kernel-dev-1a0c3298d6c6bfc357c38772e7f32d193c60c77d.zip
op-kernel-dev-1a0c3298d6c6bfc357c38772e7f32d193c60c77d.tar.gz
percpu: fix compile warnings
Fix the following two compile warnings which show up on i386. mm/percpu.c:1873: warning: comparison of distinct pointer types lacks a cast mm/percpu.c:1879: warning: format '%lx' expects type 'long unsigned int', but argument 2 has type 'size_t' Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
-rw-r--r--mm/percpu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index 4a048ab..6af78c1e 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1870,13 +1870,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
OpenPOWER on IntegriCloud