Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / linux / thread_info.h

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index dfbdfb9836f469ff78184c9b99825a569953c1fd..421323e5a2d6ce3e6d82b09cacf308e59c66bac7 100644 (file)
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -23,6 +23,7 @@ struct restart_block {
                        u32 *uaddr;
                        u32 val;
                        u32 flags;
+                       u32 bitset;
                        u64 time;
                } futex;
        };