projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index
8ea5c24
..
08e3c7f
100644
(file)
--- a/
mm/mremap.c
+++ b/
mm/mremap.c
@@
-291,7
+291,7
@@
unsigned long do_mremap(unsigned long addr,
if ((addr <= new_addr) && (addr+old_len) > new_addr)
goto out;
if ((addr <= new_addr) && (addr+old_len) > new_addr)
goto out;
- ret = security_file_mmap(
0
, 0, 0, 0, new_addr, 1);
+ ret = security_file_mmap(
NULL
, 0, 0, 0, new_addr, 1);
if (ret)
goto out;
if (ret)
goto out;
@@
-399,7
+399,7
@@
unsigned long do_mremap(unsigned long addr,
goto out;
}
goto out;
}
- ret = security_file_mmap(
0
, 0, 0, 0, new_addr, 1);
+ ret = security_file_mmap(
NULL
, 0, 0, 0, new_addr, 1);
if (ret)
goto out;
}
if (ret)
goto out;
}