Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 5572e0825d80379015cde673022d13385d10e215..a39b7b91be46722789a0ce95ed5382405796077c 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -420,9 +420,9 @@ out_nc:
        return ret;
 }
 
-asmlinkage long sys_mremap(unsigned long addr,
-       unsigned long old_len, unsigned long new_len,
-       unsigned long flags, unsigned long new_addr)
+SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+               unsigned long, new_len, unsigned long, flags,
+               unsigned long, new_addr)
 {
        unsigned long ret;