Commit bb005a59 authored by Namhyung Kim's avatar Namhyung Kim Committed by Linus Torvalds

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: default avatarNamhyung Kim <namhyung@gmail.com>
Acked-by: default avatarGreg 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7223bb4a
...@@ -1376,15 +1376,15 @@ unsigned long do_mmap_pgoff(struct file *file, ...@@ -1376,15 +1376,15 @@ unsigned long do_mmap_pgoff(struct file *file,
if (capabilities & BDI_CAP_MAP_DIRECT) { if (capabilities & BDI_CAP_MAP_DIRECT) {
addr = file->f_op->get_unmapped_area(file, addr, len, addr = file->f_op->get_unmapped_area(file, addr, len,
pgoff, flags); pgoff, flags);
if (IS_ERR((void *) addr)) { if (IS_ERR_VALUE(addr)) {
ret = addr; ret = addr;
if (ret != (unsigned long) -ENOSYS) if (ret != -ENOSYS)
goto error_just_free; goto error_just_free;
/* the driver refused to tell us where to site /* the driver refused to tell us where to site
* the mapping so we'll have to attempt to copy * the mapping so we'll have to attempt to copy
* it */ * it */
ret = (unsigned long) -ENODEV; ret = -ENODEV;
if (!(capabilities & BDI_CAP_MAP_COPY)) if (!(capabilities & BDI_CAP_MAP_COPY))
goto error_just_free; goto error_just_free;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment