The patch titled
windfarm: dont die on suspend thread signal
has been added to the -mm tree. Its filename is
windfarm-dont-die-on-suspend-thread-signal.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: windfarm: dont die on suspend thread signal
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
When the windfarm thread gets a suspend signal it will die instead of
freezing. This fixes it.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/macintosh/windfarm_core.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff -puN drivers/macintosh/windfarm_core.c~windfarm-dont-die-on-suspend-thread-signal drivers/macintosh/windfarm_core.c
--- a/drivers/macintosh/windfarm_core.c~windfarm-dont-die-on-suspend-thread-signal
+++ a/drivers/macintosh/windfarm_core.c
@@ -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) {
@@ -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;
}
_
Patches currently in -mm which might be from johannes@xxxxxxxxxxxxxxxx are
git-alsa.patch
windfarm-dont-die-on-suspend-thread-signal.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
