Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e180583b85f4a48bd55924712c88e5d8eb182e08
Commit:     e180583b85f4a48bd55924712c88e5d8eb182e08
Parent:     4a177cbf84f827cf9f1d6cfa5264fafd3cc33ce0
Author:     Alexey Kuznetsov <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 15:57:59 2007 -0700
Committer:  Tony Luck <[EMAIL PROTECTED]>
CommitDate: Tue May 8 15:57:59 2007 -0700

    [IA64] wire up pselect, ppoll
    
    Signed-off-by: Alexey Kuznetsov <[EMAIL PROTECTED]>
    Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
    Signed-off-by: Tony Luck <[EMAIL PROTECTED]>
---
 arch/ia64/kernel/entry.S  |    4 ++--
 include/asm-ia64/unistd.h |    3 ++-
 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to