diff options
| author | Gautham R Shenoy <ego@in.ibm.com> | 2007-05-23 13:57:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 20:14:11 -0700 |
| commit | 88f18ba028b5939bb6f77bd690e5ad8d01bb24cc (patch) | |
| tree | eea3f79f5098f7b45723f842208b44f860f0fb71 | |
| parent | 5fcc57f2d5d558056668159f9153bf21d2c53d16 (diff) | |
freezer: move frozen_process() to kernel/power/process.c
Other than refrigerator, no one else calls frozen_process(). So move it from
include/linux/freezer.h to kernel/power/process.c.
Also, since a task can be marked as frozen by itself, we don't need to pass
the (struct task_struct *p) parameter to frozen_process().
Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/freezer.h | 13 | ||||
| -rw-r--r-- | kernel/power/process.c | 14 |
2 files changed, 13 insertions, 14 deletions
diff --git a/include/linux/freezer.h b/include/linux/freezer.h index 1045ee9c0bb..4631086f506 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h @@ -58,18 +58,6 @@ static inline int thaw_process(struct task_struct *p) return 0; } -/* - * freezing is complete, mark process as frozen - */ -static inline void frozen_process(struct task_struct *p) -{ - if (!unlikely(p->flags & PF_NOFREEZE)) { - p->flags |= PF_FROZEN; - wmb(); - } - clear_tsk_thread_flag(p, TIF_FREEZE); -} - extern void refrigerator(void); extern int freeze_processes(void); extern void thaw_processes(void); @@ -132,7 +120,6 @@ static inline int frozen(struct task_struct *p) { return 0; } static inline int freezing(struct task_struct *p) { return 0; } static inline void freeze(struct task_struct *p) { BUG(); } static inline int thaw_process(struct task_struct *p) { return 1; } -static inline void frozen_process(struct task_struct *p) { BUG(); } static inline void refrigerator(void) {} static inline int freeze_processes(void) { BUG(); return 0; } diff --git a/kernel/power/process.c b/kernel/power/process.c index 2cea2658e98..d31d638ab4c 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -31,6 +31,18 @@ static inline int freezeable(struct task_struct * p) return 1; } +/* + * freezing is complete, mark current process as frozen + */ +static inline void frozen_process(void) +{ + if (!unlikely(current->flags & PF_NOFREEZE)) { + current->flags |= PF_FROZEN; + wmb(); + } + clear_tsk_thread_flag(current, TIF_FREEZE); +} + /* Refrigerator is place where frozen processes are stored :-). */ void refrigerator(void) { @@ -40,7 +52,7 @@ void refrigerator(void) task_lock(current); if (freezing(current)) { - frozen_process(current); + frozen_process(); task_unlock(current); } else { task_unlock(current); |