Merge branch 'upstream'

[linux-2.6-omap-h63xx.git] / include / asm-i386 / unistd.h

diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index d8afd0e3b81a77501f03473f42337b7efe4b2587..014e3562895b1312608e39fc8e3478a52d0ecd53 100644 (file)
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -316,8 +316,10 @@
 #define __NR_pselect6          308
 #define __NR_ppoll             309
 #define __NR_unshare           310
+#define __NR_set_robust_list   311
+#define __NR_get_robust_list   312
 
-#define NR_syscalls 311
+#define NR_syscalls 313
 
 /*
  * user-visible error numbers are in the range -1 - -128: see