| Message ID | 20090211162247.GA32301@elte.hu (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wednesday 11 February 2009, Ingo Molnar wrote: > > * Rafael J. Wysocki <rjw@sisk.pl> wrote: > > > On Wednesday 11 February 2009, Jiri Slaby wrote: > > > On 02/11/2009 09:51 AM, Jiri Slaby wrote: > > > > On 02/11/2009 01:36 AM, akpm@linux-foundation.org wrote: > > > >> The mm-of-the-moment snapshot 2009-02-10-16-35 has been uploaded > > > > > > > > Hi, > > > > > > > > I've found out, that S4 disappeared in this release, in comparison to mmotm > > > > based on 2.6.29-rc2: > > > > -ACPI: (supports S0 S1 S3 S4 S5) > > > > +ACPI: (supports S0 S1 S3 S5) > > > > > > > > Any ideas what could have caused this? > > > > > > I think this one > > > ARCH_HIBERNATION_POSSIBLE=n > > > because > > > SMP=y > > > since > > > config ARCH_HIBERNATION_POSSIBLE > > > def_bool y > > > - depends on !SMP || !X86_VOYAGER > > > + depends on !SMP > > > > > > The condition was wrong, ok, anyway it worked. Would > > > depends on !SMP || EXPERIMENTAL > > > make sense? The smp is handled in disable_nonboot_cpus manner, right? > > > > Ah, someone removed X86_VOYAGER and left this gem. I guess that went in > > through -tip (Ingo CCed). > > > > After removing X86_VOYAGER, ARCH_HIBERNATION_POSSIBLE should always be set > > on x86. Just make it > > > > config ARCH_HIBERNATION_POSSIBLE > > def_bool y > > heh, indeed :-) Fixed via the commit below. Would it be viable to fold that into aced3ce, so that bisectability is not broken between the two? Rafael > ----------------> > From 17993b49b1f540aace8e9b4242530d0b3376eb2a Mon Sep 17 00:00:00 2001 > From: Ingo Molnar <mingo@elte.hu> > Date: Wed, 11 Feb 2009 17:20:51 +0100 > Subject: [PATCH] x86: make hibernation always-possible > > This commit: > > aced3ce: x86/Voyager: remove HIBERNATION Kconfig quirk > > Made hibernation only available on UP - instead of making it available > on all of x86. Fix it. > > Reported-by: Jiri Slaby <jirislaby@gmail.com> > Signed-off-by: Ingo Molnar <mingo@elte.hu> > --- > arch/x86/Kconfig | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index 4a27aa4..148c112 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -140,7 +140,6 @@ config HAVE_CPUMASK_OF_CPU_MAP > > config ARCH_HIBERNATION_POSSIBLE > def_bool y > - depends on !SMP > > config ARCH_SUSPEND_POSSIBLE > def_bool y -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> ----------------> > From 17993b49b1f540aace8e9b4242530d0b3376eb2a Mon Sep 17 00:00:00 2001 > From: Ingo Molnar <mingo@elte.hu> > Date: Wed, 11 Feb 2009 17:20:51 +0100 > Subject: [PATCH] x86: make hibernation always-possible > > This commit: > > aced3ce: x86/Voyager: remove HIBERNATION Kconfig quirk > > Made hibernation only available on UP - instead of making it available > on all of x86. Fix it. > > Reported-by: Jiri Slaby <jirislaby@gmail.com> > Signed-off-by: Ingo Molnar <mingo@elte.hu> ACK. Pavel
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4a27aa4..148c112 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -140,7 +140,6 @@ config HAVE_CPUMASK_OF_CPU_MAP config ARCH_HIBERNATION_POSSIBLE def_bool y - depends on !SMP config ARCH_SUSPEND_POSSIBLE def_bool y