diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-16 14:11:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-16 14:11:31 -0400 |
| commit | d34e14f690d611ffe3db09e4ed8123d86c89a831 (patch) | |
| tree | dc7d6716e2550834816e29e5928a60c00c97d9fc /arch/mips/kernel | |
| parent | 18e41da89d55014d25b9a24502ee92b7f50599f9 (diff) | |
| parent | 4e73238d163c6fcf001264832701d2a6d4927672 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Oprofile: Fix Loongson irq handler
MIPS: N32: Use compat version for sys_ppoll.
MIPS FPU emulator: allow Cause bits of FCSR to be writeable by ctc1
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 44337ba03717..a5297e2a353a 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
| @@ -385,7 +385,7 @@ EXPORT(sysn32_call_table) | |||
| 385 | PTR sys_fchmodat | 385 | PTR sys_fchmodat |
| 386 | PTR sys_faccessat | 386 | PTR sys_faccessat |
| 387 | PTR compat_sys_pselect6 | 387 | PTR compat_sys_pselect6 |
| 388 | PTR sys_ppoll /* 6265 */ | 388 | PTR compat_sys_ppoll /* 6265 */ |
| 389 | PTR sys_unshare | 389 | PTR sys_unshare |
| 390 | PTR sys_splice | 390 | PTR sys_splice |
| 391 | PTR sys_sync_file_range | 391 | PTR sys_sync_file_range |