diff options
author | Tejun Heo <tj@kernel.org> | 2011-11-21 15:32:24 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-11-21 15:32:24 -0500 |
commit | 376fede80e74d98b49d1ba9ac18f23c9fd026ddd (patch) | |
tree | 78a48a9565efabba585dd9253c6f2c12966a995e /include/linux/sched.h | |
parent | 85f1d476653f52c97ca75466b2494e67c1cbd25d (diff) |
freezer: kill PF_FREEZING
With the previous changes, there's no meaningful difference between
PF_FREEZING and PF_FROZEN. Remove PF_FREEZING and use PF_FROZEN
instead in task_contributes_to_load().
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 68daf4f27e2c..d12bd03b688f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -220,7 +220,7 @@ extern char ___assert_task_state[1 - 2*!!( | |||
220 | ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0) | 220 | ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0) |
221 | #define task_contributes_to_load(task) \ | 221 | #define task_contributes_to_load(task) \ |
222 | ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ | 222 | ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ |
223 | (task->flags & PF_FREEZING) == 0) | 223 | (task->flags & PF_FROZEN) == 0) |
224 | 224 | ||
225 | #define __set_task_state(tsk, state_value) \ | 225 | #define __set_task_state(tsk, state_value) \ |
226 | do { (tsk)->state = (state_value); } while (0) | 226 | do { (tsk)->state = (state_value); } while (0) |
@@ -1773,7 +1773,6 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t * | |||
1773 | #define PF_MEMALLOC 0x00000800 /* Allocating memory */ | 1773 | #define PF_MEMALLOC 0x00000800 /* Allocating memory */ |
1774 | #define PF_NPROC_EXCEEDED 0x00001000 /* set_user noticed that RLIMIT_NPROC was exceeded */ | 1774 | #define PF_NPROC_EXCEEDED 0x00001000 /* set_user noticed that RLIMIT_NPROC was exceeded */ |
1775 | #define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */ | 1775 | #define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */ |
1776 | #define PF_FREEZING 0x00004000 /* freeze in progress. do not account to load */ | ||
1777 | #define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */ | 1776 | #define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */ |
1778 | #define PF_FROZEN 0x00010000 /* frozen for system suspend */ | 1777 | #define PF_FROZEN 0x00010000 /* frozen for system suspend */ |
1779 | #define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */ | 1778 | #define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */ |