Merge to Fedora Core 2 kernel-2.6.8-1.521

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

diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 061a60f..bb91de3 100644 (file)
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -960,7 +960,15 @@ ENTRY(sys_call_table)
        .long sys_madvise
        .long sys_getdents64    /* 220 */
        .long sys_fcntl64
-       .long sys_ni_syscall    /* reserved for TUX */
+#ifdef CONFIG_TUX
+       .long __sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+       .long sys_tux
+# else
+       .long sys_ni_syscall
+# endif
+#endif
        .long sys_ni_syscall
        .long sys_gettid
        .long sys_readahead     /* 225 */