diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /include/asm-arm/unistd.h | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'include/asm-arm/unistd.h')
| -rw-r--r-- | include/asm-arm/unistd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index 77430d6178ae..8f331bbd39a8 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h | |||
| @@ -309,7 +309,7 @@ | |||
| 309 | #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279) | 309 | #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279) |
| 310 | #define __NR_waitid (__NR_SYSCALL_BASE+280) | 310 | #define __NR_waitid (__NR_SYSCALL_BASE+280) |
| 311 | 311 | ||
| 312 | #if 0 /* reserve these for un-muxing socketcall */ | 312 | #if defined(__ARM_EABI__) /* reserve these for un-muxing socketcall */ |
| 313 | #define __NR_socket (__NR_SYSCALL_BASE+281) | 313 | #define __NR_socket (__NR_SYSCALL_BASE+281) |
| 314 | #define __NR_bind (__NR_SYSCALL_BASE+282) | 314 | #define __NR_bind (__NR_SYSCALL_BASE+282) |
| 315 | #define __NR_connect (__NR_SYSCALL_BASE+283) | 315 | #define __NR_connect (__NR_SYSCALL_BASE+283) |
| @@ -329,7 +329,7 @@ | |||
| 329 | #define __NR_recvmsg (__NR_SYSCALL_BASE+297) | 329 | #define __NR_recvmsg (__NR_SYSCALL_BASE+297) |
| 330 | #endif | 330 | #endif |
| 331 | 331 | ||
| 332 | #if 0 /* reserve these for un-muxing ipc */ | 332 | #if defined(__ARM_EABI__) /* reserve these for un-muxing ipc */ |
| 333 | #define __NR_semop (__NR_SYSCALL_BASE+298) | 333 | #define __NR_semop (__NR_SYSCALL_BASE+298) |
| 334 | #define __NR_semget (__NR_SYSCALL_BASE+299) | 334 | #define __NR_semget (__NR_SYSCALL_BASE+299) |
| 335 | #define __NR_semctl (__NR_SYSCALL_BASE+300) | 335 | #define __NR_semctl (__NR_SYSCALL_BASE+300) |
| @@ -347,7 +347,7 @@ | |||
| 347 | #define __NR_request_key (__NR_SYSCALL_BASE+310) | 347 | #define __NR_request_key (__NR_SYSCALL_BASE+310) |
| 348 | #define __NR_keyctl (__NR_SYSCALL_BASE+311) | 348 | #define __NR_keyctl (__NR_SYSCALL_BASE+311) |
| 349 | 349 | ||
| 350 | #if 0 /* reserved for un-muxing ipc */ | 350 | #if defined(__ARM_EABI__) /* reserved for un-muxing ipc */ |
| 351 | #define __NR_semtimedop (__NR_SYSCALL_BASE+312) | 351 | #define __NR_semtimedop (__NR_SYSCALL_BASE+312) |
| 352 | #endif | 352 | #endif |
| 353 | 353 | ||