[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070307221953.GA5953@elf.ucw.cz>
Date: Wed, 7 Mar 2007 23:19:53 +0100
From: Pavel Machek <pavel@....cz>
To: "Rafael J. Wysocki" <rjw@...k.pl>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] swsusp: Disable nonboot CPUs before entering platform suspend
Hi!
> > > Prevent the WARN_ON() in arch/x86_64/kernel/acpi/sleep.c:init_low_mapping()
> > > from triggering by disabling nonboot CPUs before we finally enter the platform
> > > suspend.
> > >
> > > Signed-off-by: Rafael J. Wysocki <rjw@...k.pl>
> > > ---
> > > kernel/power/disk.c | 1 +
> > > kernel/power/user.c | 2 +-
> > > 2 files changed, 2 insertions(+), 1 deletion(-)
> > >
> > > Index: linux-2.6.21-rc2-mm2/kernel/power/disk.c
> > > ===================================================================
> > > --- linux-2.6.21-rc2-mm2.orig/kernel/power/disk.c
> > > +++ linux-2.6.21-rc2-mm2/kernel/power/disk.c
> > > @@ -61,6 +61,7 @@ static void power_down(suspend_disk_meth
> > > switch(mode) {
> > > case PM_DISK_PLATFORM:
> > > if (pm_ops && pm_ops->enter) {
> > > + disable_nonboot_cpus();
> > > kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
> > > pm_ops->enter(PM_SUSPEND_DISK);
> > > break;
> > > Index: linux-2.6.21-rc2-mm2/kernel/power/user.c
> > > ===================================================================
> > > --- linux-2.6.21-rc2-mm2.orig/kernel/power/user.c
> > > +++ linux-2.6.21-rc2-mm2/kernel/power/user.c
> > > @@ -398,9 +398,9 @@ static int snapshot_ioctl(struct inode *
> > >
> > > case PMOPS_ENTER:
> > > if (data->platform_suspend) {
> > > + disable_nonboot_cpus();
> > > kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
> > > error = pm_ops->enter(PM_SUSPEND_DISK);
> > > - error = 0;
> > > }
> > > break;
> >
> > Is this considered 2.6.21 material? If so why?
>
> Well, the WARN_ON() in arch/x86_64/kernel/acpi/sleep.c:init_low_mapping()
> triggers every time an SMP x86_64 box is suspended to disk using the platform
> mode (default), which is quite annoying IMHO and users think something wrong is
> going on. This will probably cause them to report the problem and I'd rather
> like to avoid handling these reports. ;-)
I do not quite like the patch (explanation in separate mail). Can we
remove the WARN_ON() ? ;-).
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists