diff options
author | Marcos Paulo de Souza <marcos.mage@gmail.com> | 2012-02-21 17:57:47 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-04 17:08:54 -0500 |
commit | 37f08be11be9a7d9351fb1b9b408259519a126f3 (patch) | |
tree | 7edf402614ae9f36a6e9226b380072cec969c847 | |
parent | 8671bbc1bd0442ef0eab27f7d56216431c490820 (diff) |
PM / Freezer: Remove references to TIF_FREEZE in comments
This patch removes all the references in the code about the TIF_FREEZE
flag removed by commit a3201227f803ad7fd43180c5195dbe5a2bf998aa
freezer: make freezing() test freeze conditions in effect instead of TIF_FREEZE
There still are some references to TIF_FREEZE in
Documentation/power/freezing-of-tasks.txt, but it looks like that
documentation needs more thorough work to reflect how the new
freezer works, and hence merely removing the references to TIF_FREEZE
won't really help. So I have not touched that part in this patch.
Suggested-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r-- | kernel/exit.c | 2 | ||||
-rw-r--r-- | kernel/freezer.c | 6 | ||||
-rw-r--r-- | kernel/power/process.c | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 294b1709170d..fd0af05e0639 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -424,7 +424,7 @@ void daemonize(const char *name, ...) | |||
424 | */ | 424 | */ |
425 | exit_mm(current); | 425 | exit_mm(current); |
426 | /* | 426 | /* |
427 | * We don't want to have TIF_FREEZE set if the system-wide hibernation | 427 | * We don't want to get frozen, in case system-wide hibernation |
428 | * or suspend transition begins right now. | 428 | * or suspend transition begins right now. |
429 | */ | 429 | */ |
430 | current->flags |= (PF_NOFREEZE | PF_KTHREAD); | 430 | current->flags |= (PF_NOFREEZE | PF_KTHREAD); |
diff --git a/kernel/freezer.c b/kernel/freezer.c index 9815b8d1eed5..11f82a4d4eae 100644 --- a/kernel/freezer.c +++ b/kernel/freezer.c | |||
@@ -99,9 +99,9 @@ static void fake_signal_wake_up(struct task_struct *p) | |||
99 | * freeze_task - send a freeze request to given task | 99 | * freeze_task - send a freeze request to given task |
100 | * @p: task to send the request to | 100 | * @p: task to send the request to |
101 | * | 101 | * |
102 | * If @p is freezing, the freeze request is sent by setting %TIF_FREEZE | 102 | * If @p is freezing, the freeze request is sent either by sending a fake |
103 | * flag and either sending a fake signal to it or waking it up, depending | 103 | * signal (if it's not a kernel thread) or waking it up (if it's a kernel |
104 | * on whether it has %PF_FREEZER_NOSIG set. | 104 | * thread). |
105 | * | 105 | * |
106 | * RETURNS: | 106 | * RETURNS: |
107 | * %false, if @p is not freezing or already frozen; %true, otherwise | 107 | * %false, if @p is not freezing or already frozen; %true, otherwise |
diff --git a/kernel/power/process.c b/kernel/power/process.c index 6aeb5efe00eb..0d2aeb226108 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c | |||
@@ -53,11 +53,9 @@ static int try_to_freeze_tasks(bool user_only) | |||
53 | * It is "frozen enough". If the task does wake | 53 | * It is "frozen enough". If the task does wake |
54 | * up, it will immediately call try_to_freeze. | 54 | * up, it will immediately call try_to_freeze. |
55 | * | 55 | * |
56 | * Because freeze_task() goes through p's | 56 | * Because freeze_task() goes through p's scheduler lock, it's |
57 | * scheduler lock after setting TIF_FREEZE, it's | 57 | * guaranteed that TASK_STOPPED/TRACED -> TASK_RUNNING |
58 | * guaranteed that either we see TASK_RUNNING or | 58 | * transition can't race with task state testing here. |
59 | * try_to_stop() after schedule() in ptrace/signal | ||
60 | * stop sees TIF_FREEZE. | ||
61 | */ | 59 | */ |
62 | if (!task_is_stopped_or_traced(p) && | 60 | if (!task_is_stopped_or_traced(p) && |
63 | !freezer_should_skip(p)) | 61 | !freezer_should_skip(p)) |