aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/avr32/kernel/syscall_table.S18
-rw-r--r--include/asm-avr32/unistd.h17
2 files changed, 28 insertions, 7 deletions
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index db8f8b55ffdf..52919c0eaa56 100644
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -12,10 +12,6 @@
12#define sys_nfsservctl sys_ni_syscall 12#define sys_nfsservctl sys_ni_syscall
13#endif 13#endif
14 14
15#if !defined(CONFIG_SYSV_IPC)
16# define sys_ipc sys_ni_syscall
17#endif
18
19 .section .rodata,"a",@progbits 15 .section .rodata,"a",@progbits
20 .type sys_call_table,@object 16 .type sys_call_table,@object
21 .global sys_call_table 17 .global sys_call_table
@@ -129,7 +125,7 @@ sys_call_table:
129 .long sys_getitimer /* 105 */ 125 .long sys_getitimer /* 105 */
130 .long sys_swapoff 126 .long sys_swapoff
131 .long sys_sysinfo 127 .long sys_sysinfo
132 .long sys_ipc 128 .long sys_ni_syscall /* was sys_ipc briefly */
133 .long sys_sendfile 129 .long sys_sendfile
134 .long sys_setdomainname /* 110 */ 130 .long sys_setdomainname /* 110 */
135 .long sys_newuname 131 .long sys_newuname
@@ -287,4 +283,16 @@ sys_call_table:
287 .long sys_tee 283 .long sys_tee
288 .long sys_vmsplice 284 .long sys_vmsplice
289 .long __sys_epoll_pwait /* 265 */ 285 .long __sys_epoll_pwait /* 265 */
286 .long sys_msgget
287 .long sys_msgsnd
288 .long sys_msgrcv
289 .long sys_msgctl
290 .long sys_semget /* 270 */
291 .long sys_semop
292 .long sys_semctl
293 .long sys_semtimedop
294 .long sys_shmat
295 .long sys_shmget /* 275 */
296 .long sys_shmdt
297 .long sys_shmctl
290 .long sys_ni_syscall /* r8 is saturated at nr_syscalls */ 298 .long sys_ni_syscall /* r8 is saturated at nr_syscalls */
diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
index 56ed1f9d348a..8f5120471819 100644
--- a/include/asm-avr32/unistd.h
+++ b/include/asm-avr32/unistd.h
@@ -120,7 +120,7 @@
120#define __NR_getitimer 105 120#define __NR_getitimer 105
121#define __NR_swapoff 106 121#define __NR_swapoff 106
122#define __NR_sysinfo 107 122#define __NR_sysinfo 107
123#define __NR_ipc 108 123/* 108 was __NR_ipc for a little while */
124#define __NR_sendfile 109 124#define __NR_sendfile 109
125#define __NR_setdomainname 110 125#define __NR_setdomainname 110
126#define __NR_uname 111 126#define __NR_uname 111
@@ -282,8 +282,21 @@
282#define __NR_vmsplice 264 282#define __NR_vmsplice 264
283#define __NR_epoll_pwait 265 283#define __NR_epoll_pwait 265
284 284
285#define __NR_msgget 266
286#define __NR_msgsnd 267
287#define __NR_msgrcv 268
288#define __NR_msgctl 269
289#define __NR_semget 270
290#define __NR_semop 271
291#define __NR_semctl 272
292#define __NR_semtimedop 273
293#define __NR_shmat 274
294#define __NR_shmget 275
295#define __NR_shmdt 276
296#define __NR_shmctl 277
297
285#ifdef __KERNEL__ 298#ifdef __KERNEL__
286#define NR_syscalls 266 299#define NR_syscalls 278
287 300
288 301
289#define __ARCH_WANT_IPC_PARSE_VERSION 302#define __ARCH_WANT_IPC_PARSE_VERSION