aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386/futex.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-03-27 04:16:27 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 11:44:49 -0500
commit8f17d3a5049d32392b79925c73a0cf99ce6d5af0 (patch)
tree3c2aa0cbe337684d353dd2cfb0c177b4ae15217c /include/asm-i386/futex.h
parent8fdd6c6df7889dc89df3d9fe0f5bbe6733e39f48 (diff)
[PATCH] lightweight robust futexes updates
- fix: initialize the robust list(s) to NULL in copy_process. - doc update - cleanup: rename _inuser to _inatomic - __user cleanups and other small cleanups Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Ulrich Drepper <drepper@redhat.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/futex.h')
-rw-r--r--include/asm-i386/futex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/futex.h b/include/asm-i386/futex.h
index 41184a31885c..7b8ceefd010f 100644
--- a/include/asm-i386/futex.h
+++ b/include/asm-i386/futex.h
@@ -105,7 +105,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
105} 105}
106 106
107static inline int 107static inline int
108futex_atomic_cmpxchg_inuser(int __user *uaddr, int oldval, int newval) 108futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
109{ 109{
110 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) 110 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
111 return -EFAULT; 111 return -EFAULT;