diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:19:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:19:44 -0800 |
| commit | 8a03d9a498eaf02c8a118752050a5154852c13bf (patch) | |
| tree | 8e8fd8ce48892e667092aea6532548a4f79f9c25 /include/asm-avr32/unistd.h | |
| parent | f8abea8f8c24ecdad6d6861bffb912f23f2741cd (diff) | |
| parent | 41d8ca452f523b9245704c7dd8ef290fa7b78e6b (diff) | |
| download | talos-op-linux-8a03d9a498eaf02c8a118752050a5154852c13bf.tar.gz talos-op-linux-8a03d9a498eaf02c8a118752050a5154852c13bf.zip | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Use per-controller spi_board_info structures
[AVR32] Warn, don't BUG if clk_disable is called too many times
[AVR32] Make sure all genclocks have a parent
[AVR32] Remove unnecessary sys_nfsservctl conditional
[AVR32] Wire up the SysV IPC calls properly
[AVR32] Define ioremap_nocache, ioport_map and ioport_unmap
[AVR32] Fix prototypes for __raw_writesb and friends
Diffstat (limited to 'include/asm-avr32/unistd.h')
| -rw-r--r-- | include/asm-avr32/unistd.h | 17 |
1 files changed, 15 insertions, 2 deletions
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 @@ #define __NR_getitimer 105 #define __NR_swapoff 106 #define __NR_sysinfo 107 -#define __NR_ipc 108 +/* 108 was __NR_ipc for a little while */ #define __NR_sendfile 109 #define __NR_setdomainname 110 #define __NR_uname 111 @@ -282,8 +282,21 @@ #define __NR_vmsplice 264 #define __NR_epoll_pwait 265 +#define __NR_msgget 266 +#define __NR_msgsnd 267 +#define __NR_msgrcv 268 +#define __NR_msgctl 269 +#define __NR_semget 270 +#define __NR_semop 271 +#define __NR_semctl 272 +#define __NR_semtimedop 273 +#define __NR_shmat 274 +#define __NR_shmget 275 +#define __NR_shmdt 276 +#define __NR_shmctl 277 + #ifdef __KERNEL__ -#define NR_syscalls 266 +#define NR_syscalls 278 #define __ARCH_WANT_IPC_PARSE_VERSION |
