X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fia64%2Fkernel%2Fentry.S;h=52576c34c30ac6f79bd0dad03e996a67275cdf91;hb=08559aee03be26f1300e0b97f98cf5975095ec7a;hp=6c0fc63f65a20f35d9a44babcf80b4c1e08b6b08;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 6c0fc63f6..52576c34c 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1377,15 +1377,7 @@ 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
@@ -1534,7 +1526,7 @@ sys_call_table:
 	data8 sys_mq_notify
 	data8 sys_mq_getsetattr
 	data8 sys_ni_syscall			// reserved for kexec_load
-	data8 sys_vserver
+	data8 sys_ni_syscall
 	data8 sys_ni_syscall			// 1270
 	data8 sys_ni_syscall
 	data8 sys_ni_syscall