Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / arch / ppc64 / kernel / misc.S

diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index 9111268..e0857d9 100644 (file)
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -832,15 +832,7 @@ _GLOBAL(sys_call_table32)
        .llong .compat_sys_sched_setaffinity
        .llong .compat_sys_sched_getaffinity
        .llong .sys_ni_syscall
-#ifdef CONFIG_TUX
-        .llong .__sys_tux
-#else
-# ifdef CONFIG_TUX_MODULE
-        .llong .sys_tux
-# else
-       .llong .sys_ni_syscall
-# endif
-#endif
+       .llong .sys_ni_syscall          /* 225 - reserved for tux */
        .llong .sys32_sendfile64
        .llong .compat_sys_io_setup
        .llong .sys_io_destroy
@@ -1112,15 +1104,7 @@ _GLOBAL(sys_call_table)
        .llong .sys_sched_setaffinity
        .llong .sys_sched_getaffinity
        .llong .sys_ni_syscall
-#ifdef CONFIG_TUX
-        .llong .__sys_tux
-#else
-# ifdef CONFIG_TUX_MODULE
-        .llong .sys_tux
-# else
-       .llong .sys_ni_syscall
-# endif
-#endif
+       .llong .sys_ni_syscall          /* 225 - reserved for tux */
        .llong .sys_ni_syscall          /* 32bit only sendfile64 */
        .llong .sys_io_setup
        .llong .sys_io_destroy