diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:23:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 21:23:57 -0700 |
| commit | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (patch) | |
| tree | 8c0f10ff685126b084cd86da49d07d0b09f62782 /arch/ia64/include/asm/unistd.h | |
| parent | eb3bbf805f8509f03ee479becf8c2f00737e1efb (diff) | |
| parent | a78b2de1e47b66c0f7525057652e99d1592ec77b (diff) | |
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] Add latest crop of syscalls
[IA64] Fix 64-bit atomic routines to return "long"
Diffstat (limited to 'arch/ia64/include/asm/unistd.h')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 46f36fc5125..87f1bd1efc8 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -312,11 +312,14 @@ #define __NR_pwritev 1320 #define __NR_rt_tgsigqueueinfo 1321 #define __NR_recvmmsg 1322 +#define __NR_fanotify_init 1323 +#define __NR_fanotify_mark 1324 +#define __NR_prlimit64 1325 #ifdef __KERNEL__ -#define NR_syscalls 299 /* length of syscall table */ +#define NR_syscalls 302 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about |