diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:46:58 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:46:58 -0800 |
commit | e33f6635da037ed4d2634ee6bdf5c4d601946c18 (patch) | |
tree | 443367576b9a2e30eb32c9d1c422206c87e5a1ad /include/asm-sparc64/unistd.h | |
parent | 55850f47333c6e7d932e6426eaed863b27c9cd7f (diff) | |
parent | 38192d52f159bc06b7f523800c10b583cdd661d5 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Temporarily remove IOMMU merging code.
[SPARC64]: Update defconfig.
[SPARC]: Add new timerfd syscall entries.
Diffstat (limited to 'include/asm-sparc64/unistd.h')
-rw-r--r-- | include/asm-sparc64/unistd.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index cb751b4d0f5..77559da0ea3 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h @@ -329,11 +329,13 @@ #define __NR_epoll_pwait 309 #define __NR_utimensat 310 #define __NR_signalfd 311 -#define __NR_timerfd 312 +#define __NR_timerfd_create 312 #define __NR_eventfd 313 #define __NR_fallocate 314 +#define __NR_timerfd_settime 315 +#define __NR_timerfd_gettime 316 -#define NR_SYSCALLS 315 +#define NR_SYSCALLS 317 #ifdef __KERNEL__ /* sysconf options, for SunOS compatibility */ |