diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 12:23:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 12:23:29 -0800 |
| commit | aad3bf04dca5a2147a8406f7aef5703ee5259a52 (patch) | |
| tree | 558d5915ddceab6bb47ed844dea9386c6036d087 /arch/m32r/kernel/syscall_table.S | |
| parent | 11bd04f6f35621193311c32e0721142b073a7794 (diff) | |
| parent | aa65607373a4daf2010e8c3867b6317619f3c1a3 (diff) | |
| download | linux-aad3bf04dca5a2147a8406f7aef5703ee5259a52.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap
* git://git.kernel.org/pub/scm/linux/kernel/git/viro/mmap:
Add missing alignment check in arch/score sys_mmap()
fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh
Get rid of open-coding in ia64_brk()
sparc_brk() is not needed anymore
switch do_brk() to get_unmapped_area()
Take arch_mmap_check() into get_unmapped_area()
fix a struct file leak in do_mmap_pgoff()
Unify sys_mmap*
Cut hugetlb case early for 32bit on ia64
arch_mmap_check() on mn10300
Kill ancient crap in s390 compat mmap
arm: add arch_mmap_check(), get rid of sys_arm_mremap()
file ->get_unmapped_area() shouldn't duplicate work of get_unmapped_area()
kill useless checks in sparc mremap variants
fix pgoff in "have to relocate" case of mremap()
fix the arch checks in MREMAP_FIXED case
fix checks for expand-in-place mremap
do_mremap() untangling, part 3
do_mremap() untangling, part 2
untangling do_mremap(), part 1
Diffstat (limited to 'arch/m32r/kernel/syscall_table.S')
| -rw-r--r-- | arch/m32r/kernel/syscall_table.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/syscall_table.S b/arch/m32r/kernel/syscall_table.S index aa3bf4cfab37..60536e271233 100644 --- a/arch/m32r/kernel/syscall_table.S +++ b/arch/m32r/kernel/syscall_table.S @@ -191,7 +191,7 @@ ENTRY(sys_call_table) .long sys_ni_syscall /* streams2 */ .long sys_vfork /* 190 */ .long sys_getrlimit - .long sys_mmap2 + .long sys_mmap_pgoff .long sys_truncate64 .long sys_ftruncate64 .long sys_stat64 /* 195 */ |