---

yaml --- r: 142915 b: refs/heads/master c: e3c8ca8 h: refs/heads/master i: 142913: a74f239 142911: d13741f v: v3
git-mirror · Apr 9, 2009 · ff87bbb · ff87bbb
1 parent 63add24
commit ff87bbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01fad98a1f1d3b38adcbab4bd97f7f4cb983ffb5
+refs/heads/master: e3c8ca8336707062f3f7cb1cd7e6b3c753baccdd
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -205,7 +205,8 @@ extern unsigned long long time_sync_thresh;
 #define task_is_stopped_or_traced(task)	\
 			((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
 #define task_contributes_to_load(task)	\
-				((task->state & TASK_UNINTERRUPTIBLE) != 0)
+				((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
+				 (task->flags & PF_FROZEN) == 0)
 
 #define __set_task_state(tsk, state_value)		\
 	do { (tsk)->state = (state_value); } while (0)