[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>
This commit is contained in:
committed by
Linus Torvalds
parent
8fdd6c6df7
commit
8f17d3a504
@@ -121,9 +121,9 @@ err_unlock:
|
||||
return ret;
|
||||
}
|
||||
|
||||
asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, int val,
|
||||
asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,
|
||||
struct compat_timespec __user *utime, u32 __user *uaddr2,
|
||||
int val3)
|
||||
u32 val3)
|
||||
{
|
||||
struct timespec t;
|
||||
unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
|
||||
@@ -137,6 +137,5 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, int val,
|
||||
if (op >= FUTEX_REQUEUE)
|
||||
val2 = (int) (unsigned long) utime;
|
||||
|
||||
return do_futex((unsigned long)uaddr, op, val, timeout,
|
||||
(unsigned long)uaddr2, val2, val3);
|
||||
return do_futex(uaddr, op, val, timeout, uaddr2, val2, val3);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user