blob: 75697ad3bd656c7de70cac1ebf3ad3a9601ba436 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From a3d38e875da681a90bb52ca96d0f6d6a3c87cd25 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>
---
include/linux/sched.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index afc746b..1a7d4b7 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.0.4
|
