All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pavel Machek <pavel@ucw.cz>
To: Bj?rn Mork <bmork@dod.no>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
	linux-kernel@vger.kernel.org,
	Dmitry Torokhov <dtor_core@ameritech.net>
Subject: Re: Resume from swsusp stopped working with 2.6.14 and 2.6.15-rc1
Date: Wed, 23 Nov 2005 14:25:41 +0100	[thread overview]
Message-ID: <20051123132541.GD23159@elf.ucw.cz> (raw)
In-Reply-To: <87veyjbj5q.fsf@obelix.mork.no>

Hi!

> > Ok, can you suggest better wording?
> 
> maybe something like 
> 
> --- linux-2.6.15-rc1/kernel/power/process.c.orig	2005-11-18 10:15:12.000000000 +0100
> +++ linux-2.6.15-rc1/kernel/power/process.c	2005-11-23 13:38:41.000000000 +0100
> @@ -83,7 +83,7 @@
>  		yield();			/* Yield is okay here */
>  		if (todo && time_after(jiffies, start_time + TIMEOUT)) {
>  			printk( "\n" );
> -			printk(KERN_ERR " stopping tasks failed (%d tasks remaining)\n", todo );
> +			printk(KERN_ERR " stopping tasks timed out after %d seconds (%d tasks remaining)\n", TIMEOUT/HZ, todo );
>  			break;
>  		}
>  	} while(todo);
> 
> 
> ?
> 
> Or basically any text that makes it clear that we didn't really try
> that hard to stop the task.  We just gave up early.

Ok, this should be enough.... its more accurate than original still
not too long ;-). It will go upstream ... some day.
								Pavel

Update message according to Bjorn.

---
commit 3248196034f5f0a93554b441bd41af2620afa635
tree 5bf3f8dd1ced574ca20b3c942a6b16c391c6352a
parent a57b538c084cd601a627674ebb5f09c13be42143
author <pavel@amd.(none)> Wed, 23 Nov 2005 14:23:24 +0100
committer <pavel@amd.(none)> Wed, 23 Nov 2005 14:23:24 +0100

 kernel/power/process.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/power/process.c b/kernel/power/process.c
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -83,7 +83,7 @@ int freeze_processes(void)
 		yield();			/* Yield is okay here */
 		if (todo && time_after(jiffies, start_time + TIMEOUT)) {
 			printk( "\n" );
-			printk(KERN_ERR " stopping tasks failed (%d tasks remaining)\n", todo );
+			printk(KERN_ERR " stopping tasks timed out (%d tasks remaining)\n", todo );
 			break;
 		}
 	} while(todo);

-- 
Thanks, Sharp!

  reply	other threads:[~2005-11-23 13:25 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-12 13:39 Resume from swsusp stopped working with 2.6.14 and 2.6.15-rc1 Bjørn Mork
2005-11-12 15:23 ` Dmitry Torokhov
2005-11-12 20:01   ` Pavel Machek
2005-11-12 20:39   ` Pavel Machek
2005-11-13  1:53     ` Dmitry Torokhov
2005-11-13 10:09       ` Bjørn Mork
2005-11-17 21:57 ` Dmitry Torokhov
2005-11-18  9:37   ` Bjørn Mork
2005-11-18 11:40   ` Pavel Machek
2005-11-18 11:49     ` Bjørn Mork
2005-11-18 18:31       ` Pavel Machek
2005-11-18 23:32         ` Dmitry Torokhov
2005-11-19 23:48           ` Pavel Machek
2005-11-22  5:26             ` Dmitry Torokhov
2005-11-22  8:57               ` Bjørn Mork
2005-11-22 17:46                 ` Pavel Machek
2005-11-22 18:41                   ` Bjørn Mork
2005-11-22 18:53                     ` Pavel Machek
2005-11-22 18:45                   ` Dmitry Torokhov
2005-11-22 18:59                     ` Pavel Machek
2005-11-22 19:08                       ` Dmitry Torokhov
2005-11-22 20:37                         ` Dmitry Torokhov
2005-11-22 18:47               ` Pavel Machek
2005-11-22 22:15                 ` Rafael J. Wysocki
2005-11-22 22:51                   ` Pavel Machek
2005-11-23 10:09                     ` Bjørn Mork
2005-11-23 12:01                       ` Pavel Machek
2005-11-23 13:14                         ` Bjørn Mork
2005-11-23 13:25                           ` Pavel Machek [this message]
2005-11-23 10:53                     ` Rafael J. Wysocki
2005-11-18 13:46   ` Bernd Donner
  -- strict thread matches above, loose matches on Subject: below --
2005-11-13  3:08 Bernd Donner
2005-11-13 12:13 ` Jacek Kawa

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=20051123132541.GD23159@elf.ucw.cz \
    --to=pavel@ucw.cz \
    --cc=bmork@dod.no \
    --cc=dtor_core@ameritech.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rjw@sisk.pl \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.