From: Ingo Molnar i386: add the futex_atomic_cmpxchg_inuser() assembly implementation, and wire up the new syscalls. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Arjan van de Ven Acked-by: Ulrich Drepper Signed-off-by: Andrew Morton --- arch/i386/kernel/syscall_table.S | 2 ++ include/asm-i386/futex.h | 20 +++++++++++++++++++- include/asm-i386/unistd.h | 4 +++- 3 files changed, 24 insertions(+), 2 deletions(-) diff -puN arch/i386/kernel/syscall_table.S~lightweight-robust-futexes-i386 arch/i386/kernel/syscall_table.S --- devel/arch/i386/kernel/syscall_table.S~lightweight-robust-futexes-i386 2006-02-16 02:00:51.000000000 -0800 +++ devel-akpm/arch/i386/kernel/syscall_table.S 2006-02-16 02:00:51.000000000 -0800 @@ -310,3 +310,5 @@ ENTRY(sys_call_table) .long sys_pselect6 .long sys_ppoll .long sys_unshare /* 310 */ + .long sys_set_robust_list + .long sys_get_robust_list diff -puN include/asm-i386/futex.h~lightweight-robust-futexes-i386 include/asm-i386/futex.h --- devel/include/asm-i386/futex.h~lightweight-robust-futexes-i386 2006-02-16 02:00:51.000000000 -0800 +++ devel-akpm/include/asm-i386/futex.h 2006-02-16 02:00:51.000000000 -0800 @@ -107,7 +107,25 @@ futex_atomic_op_inuser (int encoded_op, static inline int futex_atomic_cmpxchg_inuser(int __user *uaddr, int oldval, int newval) { - return -ENOSYS; + __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" + " .long 1b,3b \n" + " .previous \n" + + : "=a" (oldval), "=m" (*uaddr) + : "i" (-EFAULT), "r" (newval), "0" (oldval) + : "memory" + ); + + return oldval; } #endif diff -puN include/asm-i386/unistd.h~lightweight-robust-futexes-i386 include/asm-i386/unistd.h --- devel/include/asm-i386/unistd.h~lightweight-robust-futexes-i386 2006-02-16 02:00:51.000000000 -0800 +++ devel-akpm/include/asm-i386/unistd.h 2006-02-16 02:00:51.000000000 -0800 @@ -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 _