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"

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 46f36fc5125f..87f1bd1efc82 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