summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/unistd.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-24 07:32:42 +0200
committerJeff Garzik <jeff@garzik.org>2006-05-24 07:32:42 +0200
commit26e27cd424554202d36f38ee35421143788da127 (patch)
tree04d068c76af5b636c061173465faa574d4b5e7b0 /include/asm-sparc/unistd.h
parent[PATCH] Add PCI ID for the Intel IDE Controller which is in the Intel Mac Min... (diff)
parent[BRIDGE]: need to ref count the LLC sap (diff)
downloadlinux-26e27cd424554202d36f38ee35421143788da127.tar.xz
linux-26e27cd424554202d36f38ee35421143788da127.zip
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-sparc/unistd.h')
-rw-r--r--include/asm-sparc/unistd.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index f5611a721fbd..45a576507785 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -316,11 +316,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) \