Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / avr32 / kernel / syscall_table.S

diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index db8f8b55ffdf2925cfc0288a045c2fc463eefa3a..75c81f2dd0b3a623fb19722dc961bd99e788ccc3 100644 (file)
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -8,14 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-#if !defined(CONFIG_NFSD) && !defined(CONFIG_NFSD_MODULE)
-#define sys_nfsservctl sys_ni_syscall
-#endif
-
-#if !defined(CONFIG_SYSV_IPC)
-# define sys_ipc       sys_ni_syscall
-#endif
-
        .section .rodata,"a",@progbits
        .type   sys_call_table,@object
        .global sys_call_table
@@ -129,7 +121,7 @@ sys_call_table:
        .long   sys_getitimer           /* 105 */
        .long   sys_swapoff
        .long   sys_sysinfo
-       .long   sys_ipc
+       .long   sys_ni_syscall          /* was sys_ipc briefly */
        .long   sys_sendfile
        .long   sys_setdomainname       /* 110 */
        .long   sys_newuname
@@ -287,4 +279,20 @@ sys_call_table:
        .long   sys_tee
        .long   sys_vmsplice
        .long   __sys_epoll_pwait       /* 265 */
+       .long   sys_msgget
+       .long   sys_msgsnd
+       .long   sys_msgrcv
+       .long   sys_msgctl
+       .long   sys_semget              /* 270 */
+       .long   sys_semop
+       .long   sys_semctl
+       .long   sys_semtimedop
+       .long   sys_shmat
+       .long   sys_shmget              /* 275 */
+       .long   sys_shmdt
+       .long   sys_shmctl
+       .long   sys_utimensat
+       .long   sys_signalfd
+       .long   sys_timerfd             /* 280 */
+       .long   sys_eventfd
        .long   sys_ni_syscall          /* r8 is saturated at nr_syscalls */