summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2010-08-12 11:56:57 -0700
committerTony Luck <tony.luck@intel.com>2010-08-13 20:55:51 -0700
commita78b2de1e47b66c0f7525057652e99d1592ec77b (patch)
tree61706ac1bfcaef5d3c6486277d62dfa565e35c47 /arch
parent01d69a82e1d3c938da16bf55aab000672243aa24 (diff)
downloadlinux-stable-a78b2de1e47b66c0f7525057652e99d1592ec77b.tar.gz
linux-stable-a78b2de1e47b66c0f7525057652e99d1592ec77b.tar.bz2
linux-stable-a78b2de1e47b66c0f7525057652e99d1592ec77b.zip
[IA64] Add latest crop of syscalls
Three new syscalls for 2.6.36: prlimit64, fanotify_init and fanotify_mark. Wire up the ia64 syscall table for them. Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/include/asm/unistd.h5
-rw-r--r--arch/ia64/kernel/entry.S3
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index bb8b0fff32b3..637e90f11d85 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
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 9a260b317d8d..244704a174de 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1768,6 +1768,9 @@ sys_call_table:
data8 sys_pwritev // 1320
data8 sys_rt_tgsigqueueinfo
data8 sys_recvmmsg
+ data8 sys_fanotify_init
+ data8 sys_fanotify_mark
+ data8 sys_prlimit64 // 1325
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */