git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[pandora-kernel.git]
/
include
/
linux
/
thread_info.h
diff --git
a/include/linux/thread_info.h
b/include/linux/thread_info.h
index
e6b820f
..
a8cc4e1
100644
(file)
--- a/
include/linux/thread_info.h
+++ b/
include/linux/thread_info.h
@@
-21,13
+21,14
@@
struct restart_block {
struct {
unsigned long arg0, arg1, arg2, arg3;
};
- /* For futex_wait */
+ /* For futex_wait
and futex_wait_requeue_pi
*/
struct {
u32 *uaddr;
u32 val;
u32 flags;
u32 bitset;
u64 time;
+ u32 *uaddr2;
} futex;
/* For nanosleep */
struct {