git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
mips
/
kernel
/
scall64-o32.S
diff --git
a/arch/mips/kernel/scall64-o32.S
b/arch/mips/kernel/scall64-o32.S
index
7ac3efe
..
cc67474
100644
(file)
--- a/
arch/mips/kernel/scall64-o32.S
+++ b/
arch/mips/kernel/scall64-o32.S
@@
-13,10
+13,10
@@
* to ABI64 calling convention. 64-bit syscalls are also processed
* here for now.
*/
* to ABI64 calling convention. 64-bit syscalls are also processed
* here for now.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <asm/asm.h>
#include <asm/asmmacro.h>
#include <linux/errno.h>
#include <asm/asm.h>
#include <asm/asmmacro.h>
+#include <asm/irqflags.h>
#include <asm/mipsregs.h>
#include <asm/regdef.h>
#include <asm/stackframe.h>
#include <asm/mipsregs.h>
#include <asm/regdef.h>
#include <asm/stackframe.h>
@@
-28,6
+28,7
@@
NESTED(handle_sys, PT_SIZE, sp)
.set noat
SAVE_SOME
NESTED(handle_sys, PT_SIZE, sp)
.set noat
SAVE_SOME
+ TRACE_IRQS_ON_RELOAD
STI
.set at
ld t1, PT_EPC(sp) # skip syscall on return
STI
.set at
ld t1, PT_EPC(sp) # skip syscall on return
@@
-225,7
+226,7
@@
sys_call_table:
PTR sys_ni_syscall /* was sys_stat */
PTR sys_lseek
PTR sys_getpid /* 4020 */
PTR sys_ni_syscall /* was sys_stat */
PTR sys_lseek
PTR sys_getpid /* 4020 */
- PTR sys_mount
+ PTR
compat_
sys_mount
PTR sys_oldumount
PTR sys_setuid
PTR sys_getuid
PTR sys_oldumount
PTR sys_setuid
PTR sys_getuid
@@
-497,7
+498,7
@@
sys_call_table:
PTR sys_mknodat /* 4290 */
PTR sys_fchownat
PTR compat_sys_futimesat
PTR sys_mknodat /* 4290 */
PTR sys_fchownat
PTR compat_sys_futimesat
- PTR
compat_
sys_newfstatat
+ PTR sys_newfstatat
PTR sys_unlinkat
PTR sys_renameat /* 4295 */
PTR sys_linkat
PTR sys_unlinkat
PTR sys_renameat /* 4295 */
PTR sys_linkat
@@
-510,4
+511,12
@@
sys_call_table:
PTR sys_unshare
PTR sys_splice
PTR sys32_sync_file_range /* 4305 */
PTR sys_unshare
PTR sys_splice
PTR sys32_sync_file_range /* 4305 */
+ PTR sys_tee
+ PTR sys_vmsplice
+ PTR compat_sys_move_pages
+ PTR compat_sys_set_robust_list
+ PTR compat_sys_get_robust_list /* 4310 */
+ PTR compat_sys_kexec_load
+ PTR sys_getcpu
+ PTR sys_epoll_pwait
.size sys_call_table,.-sys_call_table
.size sys_call_table,.-sys_call_table