git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-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 797e0d87488930fc4c453066a41eb3b4cf67a5f9..19c4ca481b02c3ee1ccc6560a1748d2807959ebf 100644
(file)
--- a/
arch/mips/kernel/scall64-o32.S
+++ b/
arch/mips/kernel/scall64-o32.S
@@
-328,7
+328,7
@@
sys_call_table:
PTR sys_setdomainname
PTR sys32_newuname
PTR sys_ni_syscall /* sys_modify_ldt */
- PTR
sys32
_adjtimex
+ PTR
compat_sys
_adjtimex
PTR sys_mprotect /* 4125 */
PTR compat_sys_sigprocmask
PTR sys_ni_syscall /* was creat_module */