This commit was manufactured by cvs2svn to create branch

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

diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index d0d509e..9111268 100644 (file)
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -832,7 +832,15 @@ _GLOBAL(sys_call_table32)
        .llong .compat_sys_sched_setaffinity
        .llong .compat_sys_sched_getaffinity
        .llong .sys_ni_syscall
-       .llong .sys_ni_syscall          /* 225 - reserved for tux */
+#ifdef CONFIG_TUX
+        .llong .__sys_tux
+#else
+# ifdef CONFIG_TUX_MODULE
+        .llong .sys_tux
+# else
+       .llong .sys_ni_syscall
+# endif
+#endif
        .llong .sys32_sendfile64
        .llong .compat_sys_io_setup
        .llong .sys_io_destroy
@@ -864,7 +872,7 @@ _GLOBAL(sys_call_table32)
        .llong .ppc32_fadvise64_64      /* 32bit only fadvise64_64 */
        .llong .ppc_rtas                /* 255 */
        .llong .sys_ni_syscall          /* 256 reserved for sys_debug_setcontext */
-       .llong .sys_ni_syscall          /* 257 reserved for vserver */
+       .llong .sys_vserver
        .llong .sys_ni_syscall          /* 258 reserved for new sys_remap_file_pages */
        .llong .sys_ni_syscall          /* 259 reserved for new sys_mbind */
        .llong .sys_ni_syscall          /* 260 reserved for new sys_get_mempolicy */
@@ -1104,7 +1112,15 @@ _GLOBAL(sys_call_table)
        .llong .sys_sched_setaffinity
        .llong .sys_sched_getaffinity
        .llong .sys_ni_syscall
-       .llong .sys_ni_syscall          /* 225 - reserved for tux */
+#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          /* 32bit only sendfile64 */
        .llong .sys_io_setup
        .llong .sys_io_destroy