From ca80a35194b88b581475e4e75cf40cc2a451a24b Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 17 Dec 2009 13:16:27 +0100
Subject: [PATCH] --- yaml --- r: 178039 b: refs/heads/master c:
 733421516b42c44b9e21f1793c430cc801ef8324 h: refs/heads/master i:   178037:
 5042689d5e1e454ba32591ff61d62e98ef3cd371   178035:
 565f4fd9eaf42a42423ca57ae95596ec7e32a242   178031:
 be4cc739e8dda590898eaa07fe0b71faf50c5361 v: v3

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

diff --git a/[refs] b/[refs]
index 13e79a3ccbae..bd4bd0ed17ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 234da7bcdc7aaa935846534c3b726dbc79a9cdd5
+refs/heads/master: 733421516b42c44b9e21f1793c430cc801ef8324
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 973b2b89f86d..c28ed1b1d7c2 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -193,6 +193,8 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 #define TASK_WAKEKILL		128
 #define TASK_WAKING		256
 
+#define TASK_STATE_TO_CHAR_STR "RSDTtZX"
+
 /* Convenience macros for the sake of set_task_state */
 #define TASK_KILLABLE		(TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
 #define TASK_STOPPED		(TASK_WAKEKILL | __TASK_STOPPED)
@@ -2595,8 +2597,6 @@ static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p)
 }
 #endif /* CONFIG_MM_OWNER */
 
-#define TASK_STATE_TO_CHAR_STR "RSDTtZX"
-
 #endif /* __KERNEL__ */
 
 #endif