diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-01 11:47:58 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-01 11:47:58 (GMT) |
commit | 55f2b78995826d549401bdf20abeac1832636bb6 (patch) | |
tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /arch/mips/kernel/scall64-64.S | |
parent | f5c1aa1537be39d8b9bb5279b5881d81898fd3cd (diff) | |
parent | 92b9af9e4f144535c65aee673cfad309f25fa465 (diff) | |
download | linux-fsl-qoriq-55f2b78995826d549401bdf20abeac1832636bb6.tar.xz |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'arch/mips/kernel/scall64-64.S')
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index a9e1716..9b46986 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S @@ -207,7 +207,7 @@ sys_call_table: PTR sys_newlstat PTR sys_poll PTR sys_lseek - PTR old_mmap + PTR sys_mips_mmap PTR sys_mprotect /* 5010 */ PTR sys_munmap PTR sys_brk |