Merge branch 'master' into sh/st-integration

[safe/jmp/linux-2.6] / arch / sh / kernel / syscalls_32.S

diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index f9e21fa..19fd11d 100644 (file)
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -139,7 +139,7 @@ ENTRY(sys_call_table)
        .long sys_clone         /* 120 */
        .long sys_setdomainname
        .long sys_newuname
-       .long sys_ni_syscall    /* sys_modify_ldt */
+       .long sys_cacheflush    /* x86: sys_modify_ldt */
        .long sys_adjtimex
        .long sys_mprotect              /* 125 */
        .long sys_sigprocmask
@@ -352,4 +352,4 @@ ENTRY(sys_call_table)
        .long sys_preadv
        .long sys_pwritev
        .long sys_rt_tgsigqueueinfo     /* 335 */
-       .long sys_perf_counter_open
+       .long sys_perf_event_open