diff options
author | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
tree | 04c065ace8c62953441bc22079b93449b996f283 /include/asm-ia64/unistd.h | |
parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
download | op-kernel-dev-29f147d746326e4db5fe350c70373081d61a2965.zip op-kernel-dev-29f147d746326e4db5fe350c70373081d61a2965.tar.gz |
Merge branch 'merge'
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 a40ebec..7107763 100644 --- a/include/asm-ia64/unistd.h +++ b/include/asm-ia64/unistd.h @@ -290,12 +290,13 @@ #define __NR_get_robust_list 1299 #define __NR_sync_file_range 1300 #define __NR_tee 1301 +#define __NR_vmsplice 1302 #ifdef __KERNEL__ #include <linux/config.h> -#define NR_syscalls 278 /* length of syscall table */ +#define NR_syscalls 279 /* length of syscall table */ #define __ARCH_WANT_SYS_RT_SIGACTION |