Merge branch 'master' into upstream

[pandora-kernel.git] / arch / sh / kernel / syscalls.S

diff --git a/arch/sh/kernel/syscalls.S b/arch/sh/kernel/syscalls.S
index 768334e..38fc8cd 100644 (file)
--- a/arch/sh/kernel/syscalls.S
+++ b/arch/sh/kernel/syscalls.S
@@ -319,15 +319,15 @@ ENTRY(sys_call_table)
        .long sys_mq_getsetattr
        .long sys_kexec_load
        .long sys_waitid
-       .long sys_ni_syscall            /* 285 */
-       .long sys_add_key
+       .long sys_add_key               /* 285 */
        .long sys_request_key
        .long sys_keyctl
        .long sys_ioprio_set
-       .long sys_ioprio_get            /* 290 */
-       .long sys_inotify_init
+       .long sys_ioprio_get
+       .long sys_inotify_init          /* 290 */
        .long sys_inotify_add_watch
        .long sys_inotify_rm_watch
+       .long sys_ni_syscall
        .long sys_migrate_pages
        .long sys_openat                /* 295 */
        .long sys_mkdirat
@@ -351,3 +351,6 @@ ENTRY(sys_call_table)
        .long sys_sync_file_range
        .long sys_tee                   /* 315 */
        .long sys_vmsplice
+       .long sys_move_pages
+       .long sys_getcpu
+       .long sys_epoll_pwait