From 70cc1fef135322cee80a38c4b7f2f4b92cfec5a3 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 17 Jan 2011 19:40:54 -0500
Subject: [PATCH] fix up TASK_STATE entry

This is one of several extractions from the merge up to 33-rc8.

You can find the origin of this change in the tip merge commit:

     commit 5f854cfc024622e4aae14d7cf422f6ff86278688
     Merge: cc24da0 4ec62b2
     Author: Thomas Gleixner <tglx@linutronix.de>
     Date:   Sun Feb 21 20:17:22 2010 +0100

         Forward to 2.6.33-rc8

         Merge branch 'linus' into rt/head with a pile of conflicts.

         Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Normally there are not significant changes/additions in a merge commit that
are not from any other "normal" commit.  But in this case there are, so
break them out into separate explicit commits.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4883407..c969a10 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -210,8 +210,8 @@ extern struct semaphore kernel_sem;
 /* in tsk->state again */
 #define TASK_DEAD		128
 #define TASK_WAKEKILL		256
-#define TASK_WAKING		256
-#define TASK_STATE_MAX		512
+#define TASK_WAKING		512
+#define TASK_STATE_MAX		1024
 
 #define TASK_STATE_TO_CHAR_STR "RMSDTtZXxKW"
 
-- 
1.7.1.1