diff options
author | Tejun Heo <tj@kernel.org> | 2009-10-03 20:31:05 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-10-12 04:04:42 -0400 |
commit | 1a0c3298d6c6bfc357c38772e7f32d193c60c77d (patch) | |
tree | dc39e4615cb321689176b75b6ddb6bf70c7ff569 /mm/percpu.c | |
parent | f2badb0c950ed308be9b321203b9c8d341690cd4 (diff) |
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>
Diffstat (limited to 'mm/percpu.c')
-rw-r--r-- | mm/percpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 4a048abad043..6af78c1ee704 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, | |||
1870 | max_distance = 0; | 1870 | max_distance = 0; |
1871 | for (group = 0; group < ai->nr_groups; group++) { | 1871 | for (group = 0; group < ai->nr_groups; group++) { |
1872 | ai->groups[group].base_offset = areas[group] - base; | 1872 | ai->groups[group].base_offset = areas[group] - base; |
1873 | max_distance = max(max_distance, ai->groups[group].base_offset); | 1873 | max_distance = max_t(size_t, max_distance, |
1874 | ai->groups[group].base_offset); | ||
1874 | } | 1875 | } |
1875 | max_distance += ai->unit_size; | 1876 | max_distance += ai->unit_size; |
1876 | 1877 | ||
1877 | /* warn if maximum distance is further than 75% of vmalloc space */ | 1878 | /* warn if maximum distance is further than 75% of vmalloc space */ |
1878 | if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) { | 1879 | if (max_distance > (VMALLOC_END - VMALLOC_START) * 3 / 4) { |
1879 | pr_warning("PERCPU: max_distance=0x%lx too large for vmalloc " | 1880 | pr_warning("PERCPU: max_distance=0x%zx too large for vmalloc " |
1880 | "space 0x%lx\n", | 1881 | "space 0x%lx\n", |
1881 | max_distance, VMALLOC_END - VMALLOC_START); | 1882 | max_distance, VMALLOC_END - VMALLOC_START); |
1882 | #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK | 1883 | #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK |