This commit was manufactured by cvs2svn to create branch

[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..6c0fc63 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1377,7 +1377,15 @@ sys_call_table:
        data8 sys_syslog
        data8 sys_setitimer
        data8 sys_getitimer
+#ifdef CONFIG_TUX
+       data8 __sys_tux                         // 1120         /* was: ia64_oldstat */
+#else
+# ifdef CONFIG_TUX_MODULE
+       data8 sys_tux                           // 1120         /* was: ia64_oldstat */
+# else
        data8 sys_ni_syscall                    // 1120         /* was: ia64_oldstat */
+# endif
+#endif
        data8 sys_ni_syscall                                    /* was: ia64_oldlstat */
        data8 sys_ni_syscall                                    /* was: ia64_oldfstat */
        data8 sys_vhangup
@@ -1526,7 +1534,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