summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-24 01:32:42 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-24 01:32:42 -0400
commit26e27cd424554202d36f38ee35421143788da127 (patch)
tree04d068c76af5b636c061173465faa574d4b5e7b0 /include/asm-powerpc
parentb74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff)
parent387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff)
downloadkernel-crypto-26e27cd424554202d36f38ee35421143788da127.tar.gz
kernel-crypto-26e27cd424554202d36f38ee35421143788da127.tar.xz
kernel-crypto-26e27cd424554202d36f38ee35421143788da127.zip
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/unistd.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index 908acb44cb8..edde2462bf5 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -321,8 +321,10 @@
#define __NR_readlinkat 296
#define __NR_fchmodat 297
#define __NR_faccessat 298
+#define __NR_get_robust_list 299
+#define __NR_set_robust_list 300
-#define __NR_syscalls 299
+#define __NR_syscalls 301
#ifdef __KERNEL__
#define __NR__exit __NR_exit