aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/unistd.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-24 09:22:21 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-24 09:22:21 +0100
commit66643de455c27973ac31ad6de9f859d399916842 (patch)
tree7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /include/asm-powerpc/unistd.h
parent2c23d62abb820e19c54012520f08a198c2233a85 (diff)
parent387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff)
downloadkernel_samsung_smdk4412-66643de455c27973ac31ad6de9f859d399916842.zip
kernel_samsung_smdk4412-66643de455c27973ac31ad6de9f859d399916842.tar.gz
kernel_samsung_smdk4412-66643de455c27973ac31ad6de9f859d399916842.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-powerpc/unistd.h')
-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 9e2c9e1..eb66eae 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -321,10 +321,12 @@
#define __NR_readlinkat 296
#define __NR_fchmodat 297
#define __NR_faccessat 298
+#define __NR_get_robust_list 299
+#define __NR_set_robust_list 300
#ifdef __KERNEL__
-#define __NR_syscalls 299
+#define __NR_syscalls 301
#define __NR__exit __NR_exit
#define NR_syscalls __NR_syscalls