From 0f1fb416f709876988360578d773dd4d15673424 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 17 May 2008 08:28:33 +0200
Subject: [PATCH] --- yaml --- r: 99519 b: refs/heads/master c:
 dedd4915af40cff6614707c50dcae43d17beadec h: refs/heads/master i:   99517:
 9230eee9b41259c8a5c520431e73fd9324bb7ceb   99515:
 7754f9d785795c83e96fec0755dd44c466c037b0   99511:
 01ea618beb9dab9e1f7551ba290250efbdd982c9   99503:
 8888e1e070379ae68f15d4e40d5a2f162415d66e   99487:
 4d37fdc72f44e35764270a77827c899a28da09c4   99455:
 5ab95b0eed59027ab6813d37c59b519c9b6da061 v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-x86/thread_info.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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;