Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / arch / ia64 / kernel / entry.S

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 52576c3..0b24641 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1526,7 +1526,7 @@ sys_call_table:
        data8 sys_mq_notify
        data8 sys_mq_getsetattr
        data8 sys_ni_syscall                    // reserved for kexec_load
-       data8 sys_ni_syscall
+       data8 sys_vserver
        data8 sys_ni_syscall                    // 1270
        data8 sys_ni_syscall
        data8 sys_ni_syscall