public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
From: Pavel Machek <pavel@ucw.cz>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-pm@lists.osdl.org,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: Re: [linux-pm] Re: [PATCH] Don't explode on swsusp failure to find swap
Date: Wed, 1 Jun 2005 22:42:07 +0200	[thread overview]
Message-ID: <20050601204207.GA11163@elf.ucw.cz> (raw)
In-Reply-To: <200506012120.40607.rjw@sisk.pl>

Hi!

> > diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
> > --- a/kernel/power/swsusp.c
> > +++ b/kernel/power/swsusp.c
> > @@ -975,13 +975,6 @@ extern asmlinkage int swsusp_arch_resume
> >  
> >  asmlinkage int swsusp_save(void)
> >  {
> > -	int error = 0;
> > -
> > -	if ((error = swsusp_swap_check())) {
> > -		printk(KERN_ERR "swsusp: FATAL: cannot find swap device, try "
> > -				"swapon -a!\n");
> > -		return error;
> > -	}
> >  	return suspend_prepare_image();
> >  }
> 
> I think we can move the contents of suspend_prepare_image() directly to
> swsusp_save().  It's not used anywhere else.

I thought about that, too, but bugfixes first, cleanups next.

									Pavel

      reply	other threads:[~2005-06-01 20:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-31  7:13 [PATCH] Don't explode on swsusp failure to find swap Benjamin Herrenschmidt
2005-05-31 10:36 ` Pavel Machek
2005-05-31 14:45   ` Benjamin Herrenschmidt
2005-05-31 23:50     ` Benjamin Herrenschmidt
2005-06-01  6:52       ` Shaohua Li
2005-06-01  9:29         ` Pavel Machek
2005-06-01  9:27       ` Pavel Machek
2005-06-01 19:20         ` [linux-pm] " Rafael J. Wysocki
2005-06-01 20:42           ` Pavel Machek [this message]

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=20050601204207.GA11163@elf.ucw.cz \
    --to=pavel@ucw.cz \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@lists.osdl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox