aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Kuznetsov <kuznet@ms2.inr.ac.ru>2007-05-08 15:57:59 -0700
committerTony Luck <tony.luck@intel.com>2007-05-08 15:57:59 -0700
commite180583b85f4a48bd55924712c88e5d8eb182e08 (patch)
treea746d816fcda759c6c5ede31f70460dd504b9718
parent4a177cbf84f827cf9f1d6cfa5264fafd3cc33ce0 (diff)
downloadkernel_samsung_smdk4412-e180583b85f4a48bd55924712c88e5d8eb182e08.zip
kernel_samsung_smdk4412-e180583b85f4a48bd55924712c88e5d8eb182e08.tar.gz
kernel_samsung_smdk4412-e180583b85f4a48bd55924712c88e5d8eb182e08.tar.bz2
[IA64] wire up pselect, ppoll
Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/kernel/entry.S4
-rw-r--r--include/asm-ia64/unistd.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 156a6fa..b50bf20 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1572,8 +1572,8 @@ sys_call_table:
data8 sys_readlinkat
data8 sys_fchmodat
data8 sys_faccessat
- data8 sys_ni_syscall // reserved for pselect
- data8 sys_ni_syscall // 1295 reserved for ppoll
+ data8 sys_pselect6
+ data8 sys_ppoll
data8 sys_unshare
data8 sys_splice
data8 sys_set_robust_list
diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index e586739..861c8ec 100644
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -283,7 +283,8 @@
#define __NR_readlinkat 1291
#define __NR_fchmodat 1292
#define __NR_faccessat 1293
-/* 1294, 1295 reserved for pselect/ppoll */
+#define __NR_pselect6 1294
+#define __NR_ppoll 1295
#define __NR_unshare 1296
#define __NR_splice 1297
#define __NR_set_robust_list 1298