summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/unistd.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-05-22 14:26:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-05-22 14:26:25 -0400
commit3b38f317e529d8396377dafc7d95a1451a151df5 (patch)
tree65e80799417c456bdd907b7d80182732be02e5f4 /include/asm-sparc64/unistd.h
parent5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 (diff)
parent353b28bafd1b962359a866ff263a7fad833d29a1 (diff)
downloadblackbird-op-linux-3b38f317e529d8396377dafc7d95a1451a151df5.tar.gz
blackbird-op-linux-3b38f317e529d8396377dafc7d95a1451a151df5.zip
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/asm-sparc64/unistd.h')
-rw-r--r--include/asm-sparc64/unistd.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index 68705748bec0..998ef4ab0e06 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -318,11 +318,13 @@
#define __NR_pselect6 297
#define __NR_ppoll 298
#define __NR_unshare 299
+#define __NR_set_robust_list 300
+#define __NR_get_robust_list 301
-/* WARNING: You MAY NOT add syscall numbers larger than 299, since
+/* WARNING: You MAY NOT add syscall numbers larger than 301, since
* all of the syscall tables in the Sparc kernel are
- * sized to have 299 entries (starting at zero). Therefore
- * find a free slot in the 0-299 range.
+ * sized to have 301 entries (starting at zero). Therefore
+ * find a free slot in the 0-301 range.
*/
#define _syscall0(type,name) \
OpenPOWER on IntegriCloud