Skip to content

Commit

Permalink
[POWERPC] windfarm: don't die on suspend thread signal
Browse files Browse the repository at this point in the history
When the windfarm thread gets a suspend signal it will die instead of
freezing. This fixes it.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Johannes Berg authored and Paul Mackerras committed Feb 8, 2007
1 parent 92d4dda commit 1ed2ddf
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/macintosh/windfarm_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ static int wf_thread_func(void *data)
DBG("wf: thread started\n");

while(!kthread_should_stop()) {
try_to_freeze();

if (time_after_eq(jiffies, next)) {
wf_notify(WF_EVENT_TICK, NULL);
if (wf_overtemp) {
Expand All @@ -118,8 +116,8 @@ static int wf_thread_func(void *data)
if (delay <= HZ)
schedule_timeout_interruptible(delay);

/* there should be no signal, but oh well */
if (signal_pending(current)) {
/* 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;
}
Expand Down

0 comments on commit 1ed2ddf

Please sign in to comment.