aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2011-05-24 20:11:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 11:39:07 -0400
commitbb005a59e08733bb416126dc184f73120fc6366b (patch)
treef02e152c9f1af2c979b11ff4b3fcc7820b5644f5 /mm
parent7223bb4a829628bdf37d544ed4363d99bac1ade6 (diff)
mm: nommu: fix a compile warning in do_mmap_pgoff()
Because 'ret' is declared as int, not unsigned long, no need to cast the error contants into unsigned long. If you compile this code on a 64-bit machine somehow, you'll see following warning: CC mm/nommu.o mm/nommu.c: In function `do_mmap_pgoff': mm/nommu.c:1411: warning: overflow in implicit constant conversion Signed-off-by: Namhyung Kim <namhyung@gmail.com> Acked-by: Greg Ungerer <gerg@uclinux.org> Cc: David Howells <dhowells@redhat.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/nommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index 57ae6126b29a..92e1a47d1e52 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1376,15 +1376,15 @@ unsigned long do_mmap_pgoff(struct file *file,
1376 if (capabilities & BDI_CAP_MAP_DIRECT) { 1376 if (capabilities & BDI_CAP_MAP_DIRECT) {
1377 addr = file->f_op->get_unmapped_area(file, addr, len, 1377 addr = file->f_op->get_unmapped_area(file, addr, len,
1378 pgoff, flags); 1378 pgoff, flags);
1379 if (IS_ERR((void *) addr)) { 1379 if (IS_ERR_VALUE(addr)) {
1380 ret = addr; 1380 ret = addr;
1381 if (ret != (unsigned long) -ENOSYS) 1381 if (ret != -ENOSYS)
1382 goto error_just_free; 1382 goto error_just_free;
1383 1383
1384 /* the driver refused to tell us where to site 1384 /* the driver refused to tell us where to site
1385 * the mapping so we'll have to attempt to copy 1385 * the mapping so we'll have to attempt to copy
1386 * it */ 1386 * it */
1387 ret = (unsigned long) -ENODEV; 1387 ret = -ENODEV;
1388 if (!(capabilities & BDI_CAP_MAP_COPY)) 1388 if (!(capabilities & BDI_CAP_MAP_COPY))
1389 goto error_just_free; 1389 goto error_just_free;
1390 1390