projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'syscalls-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...
[linux-2.6-microblaze.git]
/
mm
/
nommu.c
diff --git
a/mm/nommu.c
b/mm/nommu.c
index
838a8fd
..
4f87202
100644
(file)
--- a/
mm/nommu.c
+++ b/
mm/nommu.c
@@
-1403,9
+1403,9
@@
error_getting_region:
return -ENOMEM;
}
return -ENOMEM;
}
-
SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long,
len,
-
unsigned long, prot, unsigned long,
flags,
-
unsigned long, fd, unsigned long,
pgoff)
+
unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long
len,
+
unsigned long prot, unsigned long
flags,
+
unsigned long fd, unsigned long
pgoff)
{
struct file *file = NULL;
unsigned long retval = -EBADF;
{
struct file *file = NULL;
unsigned long retval = -EBADF;
@@
-1427,6
+1427,13
@@
out:
return retval;
}
return retval;
}
+SYSCALL_DEFINE6(mmap_pgoff, unsigned long, addr, unsigned long, len,
+ unsigned long, prot, unsigned long, flags,
+ unsigned long, fd, unsigned long, pgoff)
+{
+ return ksys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
+}
+
#ifdef __ARCH_WANT_SYS_OLD_MMAP
struct mmap_arg_struct {
unsigned long addr;
#ifdef __ARCH_WANT_SYS_OLD_MMAP
struct mmap_arg_struct {
unsigned long addr;
@@
-1446,8
+1453,8
@@
SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
if (offset_in_page(a.offset))
return -EINVAL;
if (offset_in_page(a.offset))
return -EINVAL;
- return sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
- a.offset >> PAGE_SHIFT);
+ return
k
sys_mmap_pgoff(a.addr, a.len, a.prot, a.flags, a.fd,
+
a.offset >> PAGE_SHIFT);
}
#endif /* __ARCH_WANT_SYS_OLD_MMAP */
}
#endif /* __ARCH_WANT_SYS_OLD_MMAP */