diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 17:40:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 17:40:17 +0400 |
| commit | b3967dc566bc89df19e9aeb87b2fd483418b02e6 (patch) | |
| tree | 97a0fff4c1d59e3395f6b6f9d4a226da3bf58d28 /include/asm-ia64/unistd.h | |
| parent | cde227afe6b997dce08bcfc2aa6e373fb56857b0 (diff) | |
| parent | 0ffe984917b9cd6ecc19ffbc06f35869d8c18df8 (diff) | |
| download | linux-b3967dc566bc89df19e9aeb87b2fd483418b02e6.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Prefetch mmap_sem in ia64_do_page_fault()
[IA64] Failure to resume after INIT in user space
[IA64] Pass more data to the MCA/INIT notify_die hooks
[IA64] always map VGA framebuffer UC, even if it supports WB
[IA64] fix bug in ia64 __mutex_fastpath_trylock
[IA64] for_each_possible_cpu: ia64
[IA64] update HP CSR space discovery via ACPI
[IA64] Wire up new syscalls {set,get}_robust_list
[IA64] 'msg' may be used uninitialized in xpc_initiate_allocate()
[IA64] Wire up new syscall sync_file_range()
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 36070c1014d8..1c749acca021 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -286,12 +286,15 @@ /* 1294, 1295 reserved for pselect/ppoll */ #define __NR_unshare 1296 #define __NR_splice 1297 +#define __NR_set_robust_list 1298 +#define __NR_get_robust_list 1299 +#define __NR_sync_file_range 1300 #ifdef __KERNEL__ #include <linux/config.h> -#define NR_syscalls 274 /* length of syscall table */ +#define NR_syscalls 277 /* length of syscall table */ #define __ARCH_WANT_SYS_RT_SIGACTION |