diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index e56123c..767a33b 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -1098,8 +1098,8 @@ ENTRY(sys_call_table)
 	.long sys_ni_syscall_warn
 	.long sys_ni_syscall_warn
 	.long sys_ni_syscall_warn /* 310 */
-	.long sys_ni_syscall_warn
-	.long sys_ni_syscall_warn
+	.long sys_set_robust_list
+	.long sys_get_robust_list
 	.long sys_ni_syscall_warn
 	.long sys_ni_syscall_warn
 	.long sys_ni_syscall_warn /* 315 */
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 7804f4f..d4d352a 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -640,8 +640,8 @@ ia32_sys_call_table:
 	.quad quiet_ni_syscall
 	.quad quiet_ni_syscall
 	.quad quiet_ni_syscall /* 310 */
-	.quad quiet_ni_syscall
-	.quad quiet_ni_syscall
+	.quad compat_sys_set_robust_list
+	.quad compat_sys_get_robust_list
 	.quad quiet_ni_syscall
 	.quad quiet_ni_syscall
 	.quad quiet_ni_syscall /* 315 */
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 222f7f4..0f7719b 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -307,6 +307,8 @@
 #define __NR_readlinkat         305
 #define __NR_fchmodat           306
 #define __NR_faccessat          307
+#define __NR_set_robust_list    311
+#define __NR_get_robust_list    312
 #define __NR_utimensat          320
 
 #define __NR_epoll_create1	329
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
index 7b125fd..3e41de6 100644
--- a/include/asm-x86_64/unistd.h
+++ b/include/asm-x86_64/unistd.h
@@ -606,8 +606,10 @@ __SYSCALL(__NR_faccessat, sys_faccessat)
 __SYSCALL(270, sys_ni_syscall_warn)
 __SYSCALL(271, sys_ni_syscall_warn)
 __SYSCALL(272, sys_ni_syscall_warn)
-__SYSCALL(273, sys_ni_syscall_warn)
-__SYSCALL(274, sys_ni_syscall_warn)
+#define __NR_set_robust_list	273
+__SYSCALL(__NR_set_robust_list, sys_set_robust_list)
+#define __NR_get_robust_list	274
+__SYSCALL(__NR_get_robust_list, sys_get_robust_list)
 __SYSCALL(275, sys_ni_syscall_warn)
 __SYSCALL(276, sys_ni_syscall_warn)
 __SYSCALL(277, sys_ni_syscall_warn)
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 7ce1945..224c033 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -175,6 +175,11 @@ asmlinkage long sys_set_tid_address(int __user *tidptr);
 asmlinkage long sys_futex(u32 __user *uaddr, int op, int val,
 			struct timespec __user *utime, u32 __user *uaddr2,
 			int val3);
+asmlinkage long sys_get_robust_list(int pid,
+				    struct robust_list_head __user **head_ptr,
+				    size_t __user *len_ptr);
+asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
+				    size_t len);
 
 asmlinkage long sys_init_module(void __user *umod, unsigned long len,
 				const char __user *uargs);
diff --git a/kernel/sys.c b/kernel/sys.c
index f714ea2..3bbfdc6 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -384,6 +384,10 @@ cond_syscall(sys_recvmsg)
 cond_syscall(sys_socketcall)
 cond_syscall(sys_futex)
 cond_syscall(compat_sys_futex)
+cond_syscall(sys_set_robust_list)
+cond_syscall(compat_sys_set_robust_list)
+cond_syscall(sys_get_robust_list)
+cond_syscall(compat_sys_get_robust_list)
 cond_syscall(sys_epoll_create)
 cond_syscall(sys_epoll_ctl)
 cond_syscall(sys_epoll_wait)
