diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /include/asm-ia64/unistd.h | |
parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'include/asm-ia64/unistd.h')
-rw-r--r-- | include/asm-ia64/unistd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index f049bc40ca7d..d7781a2ddefe 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
@@ -296,11 +296,14 @@ | |||
296 | #define __NR_getcpu 1304 | 296 | #define __NR_getcpu 1304 |
297 | #define __NR_epoll_pwait 1305 | 297 | #define __NR_epoll_pwait 1305 |
298 | #define __NR_utimensat 1306 | 298 | #define __NR_utimensat 1306 |
299 | #define __NR_signalfd 1307 | ||
300 | #define __NR_timerfd 1308 | ||
301 | #define __NR_eventfd 1309 | ||
299 | 302 | ||
300 | #ifdef __KERNEL__ | 303 | #ifdef __KERNEL__ |
301 | 304 | ||
302 | 305 | ||
303 | #define NR_syscalls 283 /* length of syscall table */ | 306 | #define NR_syscalls 286 /* length of syscall table */ |
304 | 307 | ||
305 | #define __ARCH_WANT_SYS_RT_SIGACTION | 308 | #define __ARCH_WANT_SYS_RT_SIGACTION |
306 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 309 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |