From ff87bbb7dda32bdb72aeb19ccc781f631b7cfbc9 Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Wed, 8 Apr 2009 19:45:12 -0500 Subject: [PATCH] --- yaml --- r: 142915 b: refs/heads/master c: e3c8ca8336707062f3f7cb1cd7e6b3c753baccdd h: refs/heads/master i: 142913: a74f2397c2fd0d234c4b47091aba4e67ea2c3f79 142911: d13741f542fc0f42140e14238dd7e8767523adc6 v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9e137fd5b6b8..bb21b1051227 100644 --- 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 index 98e1fe51601d..b4c38bc8049c 100644 --- 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)