diff --git a/[refs] b/[refs]
index a3150ec91b90..f99328075dee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f51a05c16d3d051f5e000c50bccc4be91fe5f9f3
+refs/heads/master: 6ecf66ae49390bb790673d46e5fb723edcc3733b
diff --git a/trunk/include/asm-sh/thread_info.h b/trunk/include/asm-sh/thread_info.h
index 85f0c11b4319..7345350d98c0 100644
--- a/trunk/include/asm-sh/thread_info.h
+++ b/trunk/include/asm-sh/thread_info.h
@@ -18,7 +18,7 @@
 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			cpu;
 	int			preempt_count; /* 0 => preemptable, <0 => BUG */
 	struct restart_block	restart_block;