diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2011-05-25 02:11:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 17:39:07 +0200 |
| commit | bb005a59e08733bb416126dc184f73120fc6366b (patch) | |
| tree | f02e152c9f1af2c979b11ff4b3fcc7820b5644f5 /mm/nommu.c | |
| parent | mm: nommu: fix a potential memory leak in do_mmap_private() (diff) | |
| download | linux-bb005a59e08733bb416126dc184f73120fc6366b.tar.xz linux-bb005a59e08733bb416126dc184f73120fc6366b.zip | |
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 '')
| -rw-r--r-- | mm/nommu.c | 6 |
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, if (capabilities & BDI_CAP_MAP_DIRECT) { addr = file->f_op->get_unmapped_area(file, addr, len, pgoff, flags); - if (IS_ERR((void *) addr)) { + if (IS_ERR_VALUE(addr)) { ret = addr; - if (ret != (unsigned long) -ENOSYS) + if (ret != -ENOSYS) goto error_just_free; /* the driver refused to tell us where to site * the mapping so we'll have to attempt to copy * it */ - ret = (unsigned long) -ENODEV; + ret = -ENODEV; if (!(capabilities & BDI_CAP_MAP_COPY)) goto error_just_free; |