summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-23 08:23:52 +0100
committerTejun Heo <tj@kernel.org>2011-03-28 18:03:34 +0200
commit787e5b06a80e7fc9dc02d9b53a9d8d2ac63b7ace (patch)
tree98aec2df3e2d48e09a3797c0f232af3a5bfbbd38
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg... (diff)
downloadlinux-787e5b06a80e7fc9dc02d9b53a9d8d2ac63b7ace.tar.xz
linux-787e5b06a80e7fc9dc02d9b53a9d8d2ac63b7ace.zip
percpu: Cast away printk format warning
On 32-bit systems which don't happen to implicitly define or cast VMALLOC_START and/or VMALLOC_END to long in their arch headers, the printk in the percpu code will cause a warning to be emitted: mm/percpu.c: In function 'pcpu_embed_first_chunk': mm/percpu.c:1648: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'unsigned int' So add an explicit cast to unsigned long here. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--mm/percpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index 3f930018aa60..8a11cd2e976d 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1646,8 +1646,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_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%zx too large for vmalloc "
- "space 0x%lx\n",
- max_distance, VMALLOC_END - VMALLOC_START);
+ "space 0x%lx\n", max_distance,
+ (unsigned long)(VMALLOC_END - VMALLOC_START));
#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
/* and fail if we have fallback */
rc = -EINVAL;