diff options
| author | David Teigland <teigland@redhat.com> | 2006-04-27 11:49:55 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-27 11:49:55 -0400 |
| commit | d26046bb0aff707aac38a9bf3dd56fa39b28a399 (patch) | |
| tree | c59e0514ca45cb56c3cbf7920a4590dad6975bcd /include/asm-ia64 | |
| parent | e7f5c01caddbad150dcf003f76cd5aac413f4c50 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ia64')
| -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 a40ebec6aeeb..7107763168bf 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h | |||
| @@ -290,12 +290,13 @@ | |||
| 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 | #include <linux/config.h> | 297 | #include <linux/config.h> |
| 297 | 298 | ||
| 298 | #define NR_syscalls 278 /* length of syscall table */ | 299 | #define NR_syscalls 279 /* length of syscall table */ |
| 299 | 300 | ||
| 300 | #define __ARCH_WANT_SYS_RT_SIGACTION | 301 | #define __ARCH_WANT_SYS_RT_SIGACTION |
| 301 | 302 | ||