[POWERPC] windfarm: Fix windfarm thread freezer interaction
When I fixed the windfarm freezer interaction first in commit1ed2ddf380
, an earlier patch than the one I came up with after comments was committed. This has come back to haunt us now because commitd5d8c5976d
changed the freezer to no long send signals. Fix it by removing the windfarm thread's signal logic and restoring the original try_to_freeze(). We could simply revert1ed2ddf380
now but I feel that the assertion that no signal is delivered to the windfarm thread needs not be there. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
a792e75d9b
commit
67b60518b0
|
@ -95,6 +95,8 @@ static int wf_thread_func(void *data)
|
|||
|
||||
set_freezable();
|
||||
while (!kthread_should_stop()) {
|
||||
try_to_freeze();
|
||||
|
||||
if (time_after_eq(jiffies, next)) {
|
||||
wf_notify(WF_EVENT_TICK, NULL);
|
||||
if (wf_overtemp) {
|
||||
|
@ -116,12 +118,6 @@ static int wf_thread_func(void *data)
|
|||
delay = next - jiffies;
|
||||
if (delay <= HZ)
|
||||
schedule_timeout_interruptible(delay);
|
||||
|
||||
/* there should be no non-suspend signal, but oh well */
|
||||
if (signal_pending(current) && !try_to_freeze()) {
|
||||
printk(KERN_WARNING "windfarm: thread got sigl !\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
DBG("wf: thread stopped\n");
|
||||
|
|
Loading…
Reference in New Issue