diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-sh/unistd_64.h | |
parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-sh/unistd_64.h')
-rw-r--r-- | include/asm-sh/unistd_64.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-sh/unistd_64.h b/include/asm-sh/unistd_64.h index 9d21eab52427..7c54e91753c1 100644 --- a/include/asm-sh/unistd_64.h +++ b/include/asm-sh/unistd_64.h | |||
@@ -375,10 +375,16 @@ | |||
375 | #define __NR_fallocate 352 | 375 | #define __NR_fallocate 352 |
376 | #define __NR_timerfd_settime 353 | 376 | #define __NR_timerfd_settime 353 |
377 | #define __NR_timerfd_gettime 354 | 377 | #define __NR_timerfd_gettime 354 |
378 | #define __NR_signalfd4 355 | ||
379 | #define __NR_eventfd2 356 | ||
380 | #define __NR_epoll_create1 357 | ||
381 | #define __NR_dup3 358 | ||
382 | #define __NR_pipe2 359 | ||
383 | #define __NR_inotify_init1 360 | ||
378 | 384 | ||
379 | #ifdef __KERNEL__ | 385 | #ifdef __KERNEL__ |
380 | 386 | ||
381 | #define NR_syscalls 353 | 387 | #define NR_syscalls 361 |
382 | 388 | ||
383 | #define __ARCH_WANT_IPC_PARSE_VERSION | 389 | #define __ARCH_WANT_IPC_PARSE_VERSION |
384 | #define __ARCH_WANT_OLD_READDIR | 390 | #define __ARCH_WANT_OLD_READDIR |