Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / arch / m68knommu / kernel / syscalltable.S

diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 01a8c1d..4603f4f 100644 (file)
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -11,7 +11,6 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  */
 
-#include <linux/config.h>
 #include <linux/sys.h>
 #include <linux/linkage.h>
 #include <asm/unistd.h>
@@ -185,7 +184,7 @@ ENTRY(sys_call_table)
        .long sys_ni_syscall    /* sys_mremap */
        .long sys_setresuid16
        .long sys_getresuid16   /* 165 */
-       .long sys_ni_syscall    /* for vm86 */
+       .long sys_getpagesize   /* sys_getpagesize */
        .long sys_ni_syscall    /* old "query_module" */
        .long sys_poll
        .long sys_ni_syscall    /* sys_nfsservctl */
@@ -237,42 +236,99 @@ ENTRY(sys_call_table)
        .long sys_setfsuid      /* 215 */
        .long sys_setfsgid
        .long sys_pivot_root
-       .long sys_ni_syscall    /* sys_mincore */
-       .long sys_ni_syscall    /* sys_madvise */
-       .long sys_getdents64    /* 220 */
-       .long sys_fcntl64
-       .long sys_ni_syscall    /* reserved for TUX */
        .long sys_ni_syscall
+       .long sys_ni_syscall
+       .long sys_getdents64    /* 220 */
        .long sys_gettid
-       .long sys_ni_syscall    /* 225 */ /* sys_readahead */
+       .long sys_tkill
        .long sys_setxattr
        .long sys_lsetxattr
-       .long sys_fsetxattr
+       .long sys_fsetxattr     /* 225 */
        .long sys_getxattr
-       .long sys_lgetxattr     /* 230 */
+       .long sys_lgetxattr
        .long sys_fgetxattr
        .long sys_listxattr
-       .long sys_llistxattr
+       .long sys_llistxattr    /* 230 */
        .long sys_flistxattr
-       .long sys_removexattr   /* 235 */
+       .long sys_removexattr
        .long sys_lremovexattr
        .long sys_fremovexattr
-       .long sys_tkill
+       .long sys_futex         /* 235 */
        .long sys_sendfile64
-       .long sys_futex         /* 240 */
-       .long sys_sched_setaffinity
-       .long sys_sched_getaffinity
-       .long sys_ni_syscall    /* sys_set_thread_area */
-       .long sys_ni_syscall    /* sys_get_thread_area */
-       .long sys_io_setup      /* 245 */
+       .long sys_ni_syscall    /* sys_mincore */
+       .long sys_ni_syscall    /* sys_madvise */
+       .long sys_fcntl64
+       .long sys_readahead     /* 240 */
+       .long sys_io_setup
        .long sys_io_destroy
        .long sys_io_getevents
        .long sys_io_submit
-       .long sys_io_cancel
-       .long sys_ni_syscall    /* 250 */ /* sys_alloc_hugepages */
-       .long sys_ni_syscall    /* sys_freec_hugepages */
+       .long sys_io_cancel     /* 245 */
+       .long sys_fadvise64
        .long sys_exit_group
        .long sys_lookup_dcookie
+       .long sys_epoll_create
+       .long sys_epoll_ctl     /* 250 */
+       .long sys_epoll_wait
+       .long sys_ni_syscall    /* sys_remap_file_pages */
+       .long sys_set_tid_address
+       .long sys_timer_create
+       .long sys_timer_settime /* 255 */
+       .long sys_timer_gettime
+       .long sys_timer_getoverrun
+       .long sys_timer_delete
+       .long sys_clock_settime
+       .long sys_clock_gettime /* 260 */
+       .long sys_clock_getres
+       .long sys_clock_nanosleep
+       .long sys_statfs64
+       .long sys_fstatfs64
+       .long sys_tgkill        /* 265 */
+       .long sys_utimes
+       .long sys_fadvise64_64
+       .long sys_mbind 
+       .long sys_get_mempolicy
+       .long sys_set_mempolicy /* 270 */
+       .long sys_mq_open
+       .long sys_mq_unlink
+       .long sys_mq_timedsend
+       .long sys_mq_timedreceive
+       .long sys_mq_notify     /* 275 */
+       .long sys_mq_getsetattr
+       .long sys_waitid
+       .long sys_ni_syscall    /* for sys_vserver */
+       .long sys_add_key
+       .long sys_request_key   /* 280 */
+       .long sys_keyctl
+       .long sys_ioprio_set
+       .long sys_ioprio_get
+       .long sys_inotify_init
+       .long sys_inotify_add_watch     /* 285 */
+       .long sys_inotify_rm_watch
+       .long sys_migrate_pages
+       .long sys_openat
+       .long sys_mkdirat
+       .long sys_mknodat               /* 290 */
+       .long sys_fchownat
+       .long sys_futimesat
+       .long sys_fstatat64
+       .long sys_unlinkat
+       .long sys_renameat              /* 295 */
+       .long sys_linkat
+       .long sys_symlinkat
+       .long sys_readlinkat
+       .long sys_fchmodat
+       .long sys_faccessat             /* 300 */
+       .long sys_ni_syscall            /* Reserved for pselect6 */
+       .long sys_ni_syscall            /* Reserved for ppoll */
+       .long sys_unshare
+       .long sys_set_robust_list
+       .long sys_get_robust_list       /* 305 */
+       .long sys_splice
+       .long sys_sync_file_range
+       .long sys_tee
+       .long sys_vmsplice
+       .long sys_move_pages            /* 310 */
 
        .rept NR_syscalls-(.-sys_call_table)/4
                .long sys_ni_syscall