Commit:     67b60518b0ff5cd666c7650eb09f0ef41f838106
Parent:     a792e75d9b3dec3fc1dfef4a8c40674bbba44641
Author:     Johannes Berg <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 7 21:18:02 2007 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Nov 8 14:15:34 2007 +1100

    [POWERPC] windfarm: Fix windfarm thread freezer interaction
    When I fixed the windfarm freezer interaction first in commit
    1ed2ddf380e19dafeec2150ca709ef7f4a67cd21, an earlier patch than the one
    I came up with after comments was committed. This has come back to haunt
    us now because commit d5d8c5976d6adeddb8208c240460411e2198b393 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 revert 1ed2ddf380e19dafeec2150ca709ef7f4a67cd21 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 <[EMAIL PROTECTED]>
    Acked-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 drivers/macintosh/windfarm_core.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/macintosh/windfarm_core.c 
index 516d943..075b4d9 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -94,7 +94,9 @@ static int wf_thread_func(void *data)
        DBG("wf: thread started\n");
-       while(!kthread_should_stop()) {
+       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)
-               /* 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");
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to