This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 7141d7e..6777611 100644 (file)
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -565,7 +565,7 @@ _GLOBAL(_tlbie)
        SYNC_601
        isync
 #else /* CONFIG_SMP */
-       tlbie   r3
+       tlbie   r3,0
        sync
 #endif /* CONFIG_SMP */
 #endif /* ! CONFIG_40x */
@@ -1435,7 +1435,7 @@ _GLOBAL(sys_call_table)
        .long ppc_fadvise64_64
        .long sys_ni_syscall            /* 255 - rtas (used on ppc64) */
        .long sys_ni_syscall            /* 256 reserved for sys_debug_setcontext */
-       .long sys_ni_syscall            /* 257 reserved for vserver */
+       .long sys_vserver
        .long sys_ni_syscall            /* 258 reserved for new sys_remap_file_pages */
        .long sys_ni_syscall            /* 259 reserved for new sys_mbind */
        .long sys_ni_syscall            /* 260 reserved for new sys_get_mempolicy */
@@ -1446,4 +1446,10 @@ _GLOBAL(sys_call_table)
        .long sys_mq_timedreceive       /* 265 */
        .long sys_mq_notify
        .long sys_mq_getsetattr
-       .long sys_ni_syscall            /* 268 reserved for sys_kexec_load */
+       .long sys_kexec_load            /* 268 reserved for sys_kexec_load */
+#ifdef USE_IOPRIO_SYSCALLS     
+       .long sys_ioprio_set
+       .long sys_ioprio_get            
+#else
+#warning MEF not including sys_ioprio_{set,get} syscalls
+#endif