diff options
| author | Ingo Molnar | 2009-03-01 12:47:58 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-03-01 12:47:58 +0100 |
| commit | 55f2b78995826d549401bdf20abeac1832636bb6 (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /arch/mips/kernel/scall64-64.S | |
| parent | Revert "gpu/drm, x86, PAT: PAT support for io_mapping_*" (diff) | |
| parent | x86: i915 needs pgprot_writecombine() and is_io_mapping_possible() (diff) | |
| download | kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.gz kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.xz kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.zip | |
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 a9e171618994..9b4698667154 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 |