Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: futex: correctly return -EFAULT not -EINVAL lockdep: in_range() fix lockdep: fix debug_show_all_locks() sched: style cleanups futex: fix for futex_wait signal stack corruption
This commit is contained in:
@@ -7,12 +7,25 @@
|
||||
#ifndef _LINUX_THREAD_INFO_H
|
||||
#define _LINUX_THREAD_INFO_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/*
|
||||
* System call restart block.
|
||||
* System call restart block.
|
||||
*/
|
||||
struct restart_block {
|
||||
long (*fn)(struct restart_block *);
|
||||
unsigned long arg0, arg1, arg2, arg3;
|
||||
union {
|
||||
struct {
|
||||
unsigned long arg0, arg1, arg2, arg3;
|
||||
};
|
||||
/* For futex_wait */
|
||||
struct {
|
||||
u32 *uaddr;
|
||||
u32 val;
|
||||
u32 flags;
|
||||
u64 time;
|
||||
} futex;
|
||||
};
|
||||
};
|
||||
|
||||
extern long do_no_restart_syscall(struct restart_block *parm);
|
||||
|
||||
Reference in New Issue
Block a user