diff --git a/[refs] b/[refs]
index 9162b40b1877..a2636df87346 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a6c160a2a13d82c75a50af7282b906cce948df5
+refs/heads/master: dedd4915af40cff6614707c50dcae43d17beadec
diff --git a/trunk/include/asm-x86/thread_info.h b/trunk/include/asm-x86/thread_info.h
index 74481b72ae0f..25d710532561 100644
--- a/trunk/include/asm-x86/thread_info.h
+++ b/trunk/include/asm-x86/thread_info.h
@@ -24,10 +24,10 @@ struct exec_domain;
 struct thread_info {
 	struct task_struct	*task;		/* main task structure */
 	struct exec_domain	*exec_domain;	/* execution domain */
-	__u32			flags;		/* low level flags */
+	unsigned long		flags;		/* low level flags */
 	__u32			status;		/* thread synchronous flags */
 	__u32			cpu;		/* current CPU */
-	int 			preempt_count;	/* 0 => preemptable,
+	int			preempt_count;	/* 0 => preemptable,
 						   <0 => BUG */
 	mm_segment_t		addr_limit;
 	struct restart_block    restart_block;