projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.1-rc7' into perf/core
[cascardo/linux.git]
/
arch
/
x86
/
ia32
/
ia32entry.S
diff --git
a/arch/x86/ia32/ia32entry.S
b/arch/x86/ia32/ia32entry.S
index
a0e866d
..
54edb20
100644
(file)
--- a/
arch/x86/ia32/ia32entry.S
+++ b/
arch/x86/ia32/ia32entry.S
@@
-672,7
+672,7
@@
ia32_sys_call_table:
.quad sys32_vm86_warning /* vm86 */
.quad quiet_ni_syscall /* query_module */
.quad sys_poll
.quad sys32_vm86_warning /* vm86 */
.quad quiet_ni_syscall /* query_module */
.quad sys_poll
- .quad
compat_sys_nfsservctl
+ .quad
quiet_ni_syscall /* old nfsservctl */
.quad sys_setresgid16 /* 170 */
.quad sys_getresgid16
.quad sys_prctl
.quad sys_setresgid16 /* 170 */
.quad sys_getresgid16
.quad sys_prctl