From patchwork Wed Feb 11 16:22:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 6692 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1BGNSKX012541 for ; Wed, 11 Feb 2009 16:23:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755610AbZBKQX1 (ORCPT ); Wed, 11 Feb 2009 11:23:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755181AbZBKQX1 (ORCPT ); Wed, 11 Feb 2009 11:23:27 -0500 Received: from mx2.mail.elte.hu ([157.181.151.9]:44971 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754158AbZBKQX0 (ORCPT ); Wed, 11 Feb 2009 11:23:26 -0500 Received: from elvis.elte.hu ([157.181.1.14]) by mx2.mail.elte.hu with esmtp (Exim) id 1LXHrP-0006uS-Ch from ; Wed, 11 Feb 2009 17:23:01 +0100 Received: by elvis.elte.hu (Postfix, from userid 1004) id 867703E21B0; Wed, 11 Feb 2009 17:22:48 +0100 (CET) Date: Wed, 11 Feb 2009 17:22:48 +0100 From: Ingo Molnar To: "Rafael J. Wysocki" Cc: Jiri Slaby , linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org, Len Brown , linux-acpi@vger.kernel.org, Linux-pm mailing list , Pavel Machek Subject: Re: ACPI: S4 disappeared [mmotm 2009-02-10-16-35] Message-ID: <20090211162247.GA32301@elte.hu> References: <200902110036.n1B0aBZs013975@imap1.linux-foundation.org> <499291A3.9070501@gmail.com> <4992A59F.5090502@gmail.com> <200902111643.10191.rjw@sisk.pl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <200902111643.10191.rjw@sisk.pl> User-Agent: Mutt/1.5.18 (2008-05-17) Received-SPF: neutral (mx2: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu; X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org * Rafael J. Wysocki 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. Thanks, Ingo ----------------> From 17993b49b1f540aace8e9b4242530d0b3376eb2a Mon Sep 17 00:00:00 2001 From: Ingo Molnar 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 Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -- 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 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