From e2721338c12f9f84d17756c2c6abf30a636f7dbc Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 27 Mar 2006 01:16:26 -0800
Subject: [PATCH] --- yaml --- r: 24323 b: refs/heads/master c:
 8fdd6c6df7889dc89df3d9fe0f5bbe6733e39f48 h: refs/heads/master i:   24321:
 027b9078411f15f8eb82f1a49a3f7f1b0236c71c   24319:
 41d7a060eebaa89e18b38d53ba0e069f71c1fa43 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86_64/ia32/ia32entry.S |  2 ++
 trunk/include/asm-x86_64/futex.h   | 23 ++++++++++++++++++++++-
 trunk/include/asm-x86_64/unistd.h  |  6 +++++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b0f2242d7f1f..2d3d9152a619 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfd4e3ec246355274c9cf62c6b04a1ee6fa3caba
+refs/heads/master: 8fdd6c6df7889dc89df3d9fe0f5bbe6733e39f48
diff --git a/trunk/arch/x86_64/ia32/ia32entry.S b/trunk/arch/x86_64/ia32/ia32entry.S
index 7549a4389fbf..35b2faccdc6c 100644
--- a/trunk/arch/x86_64/ia32/ia32entry.S
+++ b/trunk/arch/x86_64/ia32/ia32entry.S
@@ -688,6 +688,8 @@ ia32_sys_call_table:
 	.quad sys_ni_syscall		/* pselect6 for now */
 	.quad sys_ni_syscall		/* ppoll for now */
 	.quad sys_unshare		/* 310 */
+	.quad compat_sys_set_robust_list
+	.quad compat_sys_get_robust_list
 ia32_syscall_end:		
 	.rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8
 		.quad ni_syscall
diff --git a/trunk/include/asm-x86_64/futex.h b/trunk/include/asm-x86_64/futex.h
index 4f4cb3410d06..7d9eb1a84546 100644
--- a/trunk/include/asm-x86_64/futex.h
+++ b/trunk/include/asm-x86_64/futex.h
@@ -97,7 +97,28 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
 static inline int
 futex_atomic_cmpxchg_inuser(int __user *uaddr, int oldval, int newval)
 {
-	return -ENOSYS;
+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
+		return -EFAULT;
+
+	__asm__ __volatile__(
+		"1:	" LOCK_PREFIX "cmpxchgl %3, %1		\n"
+
+		"2:	.section .fixup, \"ax\"			\n"
+		"3:	mov     %2, %0				\n"
+		"	jmp     2b				\n"
+		"	.previous				\n"
+
+		"	.section __ex_table, \"a\"		\n"
+		"	.align  8				\n"
+		"	.quad   1b,3b				\n"
+		"	.previous				\n"
+
+		: "=a" (oldval), "=m" (*uaddr)
+		: "i" (-EFAULT), "r" (newval), "0" (oldval)
+		: "memory"
+	);
+
+	return oldval;
 }
 
 #endif
diff --git a/trunk/include/asm-x86_64/unistd.h b/trunk/include/asm-x86_64/unistd.h
index da0341c57949..fcc516353087 100644
--- a/trunk/include/asm-x86_64/unistd.h
+++ b/trunk/include/asm-x86_64/unistd.h
@@ -605,8 +605,12 @@ __SYSCALL(__NR_pselect6, sys_ni_syscall)	/* for now */
 __SYSCALL(__NR_ppoll,	sys_ni_syscall)		/* for now */
 #define __NR_unshare		272
 __SYSCALL(__NR_unshare,	sys_unshare)
+#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)
 
-#define __NR_syscall_max __NR_unshare
+#define __NR_syscall_max __NR_get_robust_list
 
 #ifndef __NO_STUBS