linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: linuxppc-dev@ozlabs.org
Cc: Andrew Morton <akpm@osdl.org>,
	linux-pm@lists.osdl.org, Torrance <torrance123@gmail.com>
Subject: [PATCH 02/10] windfarm: dont die on suspend thread signal
Date: Mon, 05 Feb 2007 19:30:29 +0100	[thread overview]
Message-ID: <20070205185835.700233000@sipsolutions.net> (raw)
In-Reply-To: 20070205183026.989209000@sipsolutions.net

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>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>

---
Please apply to -mm.

--- mb-wireless.orig/drivers/macintosh/windfarm_core.c	2007-02-05 14:24:06.344526864 +0100
+++ mb-wireless/drivers/macintosh/windfarm_core.c	2007-02-05 14:24:38.264526864 +0100
@@ -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;
 		}

--

  parent reply	other threads:[~2007-02-05 19:08 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-05 18:30 [PATCH/RFC 00/10] suspend to disk for powermac G5 Johannes Berg
2007-02-05 18:30 ` [PATCH 01/10] dont copy pages that arent RAM Johannes Berg
2007-02-05 18:30 ` Johannes Berg [this message]
2007-02-05 22:43   ` [PATCH 02/10] windfarm: dont die on suspend thread signal Christoph Hellwig
2007-02-05 22:54     ` [PATCH revision 2] " Johannes Berg
2007-02-05 23:04       ` Benjamin Herrenschmidt
2007-02-05 23:04         ` Benjamin Herrenschmidt
2007-02-05 22:54   ` [PATCH 02/10] " Andrew Morton
2007-02-05 22:55     ` Johannes Berg
2007-02-05 22:58   ` Benjamin Herrenschmidt
2007-02-05 18:30 ` [PATCH 03/10] powerpc: fix comment in kernel/irq.c Johannes Berg
2007-02-05 22:59   ` Benjamin Herrenschmidt
2007-02-05 23:18     ` Andrew Morton
2007-02-05 23:53       ` Benjamin Herrenschmidt
2007-02-05 18:30 ` [PATCH 04/10] powermac: clean up PIC initialisation code Johannes Berg
2007-02-08  4:41   ` Paul Mackerras
2007-02-08 13:03     ` Johannes Berg
2007-02-05 18:30 ` [PATCH 05/10] powermac: generic time suspend/resume code Johannes Berg
2007-02-19 10:00   ` [linux-pm] " Guennadi Liakhovetski
2007-02-19 23:19     ` Guennadi Liakhovetski
2007-02-05 18:30 ` [RFC 06/10] powerpc: MPIC sys_device & suspend/resume Johannes Berg
2007-02-07 12:24   ` Johannes Berg
2007-02-05 18:30 ` [RFC 07/10] powermac: support G5 CPU hotplug Johannes Berg
2007-02-06 12:42   ` [linux-pm] " Pavel Machek
2007-02-07 11:40     ` Johannes Berg
2007-02-07 12:23   ` Johannes Berg
2007-02-05 18:30 ` [RFC 08/10] powerpc: dart iommu suspend Johannes Berg
2007-02-06  1:19   ` Olof Johansson
2007-02-06  1:26     ` Johannes Berg
2007-02-06  1:52     ` Johannes Berg
2007-02-07 12:22       ` Johannes Berg
2007-02-06 12:40   ` [linux-pm] " Pavel Machek
2007-02-07 11:42     ` Johannes Berg
2007-02-05 18:30 ` [RFC 09/10] powermac: suspend to disk on G5 Johannes Berg
2007-02-05 18:30 ` [RFC 10/10] powermac: fix G5-cpufreq for cpu on/offline Johannes Berg
2007-02-07 12:21   ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070205185835.700233000@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=akpm@osdl.org \
    --cc=linux-pm@lists.osdl.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=torrance123@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).