diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-28 20:42:26 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-28 20:42:26 -0400 |
| commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
| tree | 032f067d3af458527d903a7653885404ed82431e /include/asm-ia64/unistd.h | |
| parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-ia64/unistd.h')
| -rw-r--r-- | include/asm-ia64/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h index 395e6b2998f2..632f2eedf72c 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -290,11 +290,12 @@ | |||
| 290 | #define __NR_get_robust_list 1299 | 290 | #define __NR_get_robust_list 1299 |
| 291 | #define __NR_sync_file_range 1300 | 291 | #define __NR_sync_file_range 1300 |
| 292 | #define __NR_tee 1301 | 292 | #define __NR_tee 1301 |
| 293 | #define __NR_vmsplice 1302 | ||
| 293 | 294 | ||
| 294 | #ifdef __KERNEL__ | 295 | #ifdef __KERNEL__ |
| 295 | 296 | ||
| 296 | 297 | ||
| 297 | #define NR_syscalls 278 /* length of syscall table */ | 298 | #define NR_syscalls 279 /* length of syscall table */ |
| 298 | 299 | ||
| 299 | #define __ARCH_WANT_SYS_RT_SIGACTION | 300 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 300 | 301 | ||