[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200708032345.32262.lenb@kernel.org>
Date: Fri, 3 Aug 2007 23:45:31 -0400
From: Len Brown <lenb@...nel.org>
To: "Rafael J. Wysocki" <rjw@...k.pl>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>, Pavel Machek <pavel@....cz>,
pm list <linux-pm@...ts.linux-foundation.org>,
Adrian Bunk <bunk@...sta.de>
Subject: Re: [PATCH] PM: Fix dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION
On Friday 03 August 2007 18:47, Rafael J. Wysocki wrote:
> On Saturday, 4 August 2007 00:01, Linus Torvalds wrote:
> >
> > On Fri, 3 Aug 2007, Rafael J. Wysocki wrote:
> > > depends on PM
> > > - depends on !SMP || SUSPEND_SMP_POSSIBLE
> > > + depends on SUSPEND_SMP_POSSIBLE || ((BLACKFIN || MIPS || SUPERH || FRV \
> > > + || (PPC32 && PPC_MPC52xx)) && !SMP)
> >
> > Please, do that as SUSPEND_UP_POSSIBLE, and make it look like
> >
> > config SUSPEND_UP_POSSIBLE
> > depends on BLACKFIN || MIPS || SUPERH || FRV || ((PPC32 && PPC_MPC52xx)
> > depends on !SMP
> > default y
>
> OK
>
> > and now you can write the above thing as
> >
> > depends on SUSPEND_SMP_POSSIBLE || SUSPEND_UP_POSSIBLE
> >
> > and it's all much nicer.
> >
> > I would say that doing a similar setup for HIBERNATE would be nice too,
> > but the SUSPEND case is more noticeable because the SMP case is so nice
> > already.
>
> I did it symmetrically for suspend and hibernation and renamed SUSPEND_SMP to
> PM_SLEEP_SMP. Patch follows.
>
> Greetings,
> Rafael
>
>
> ---
> From: Rafael J. Wysocki <rjw@...k.pl>
>
> Dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION introduced by commit
> 296699de6bdc717189a331ab6bbe90e05c94db06 "Introduce CONFIG_SUSPEND for
> suspend-to-Ram and standby" are incorrect, as they don't cover the facts that
> (1) not all architectures support suspend and (2) SMP hibernation is only
> possible on X86 and PPC64 (if PPC64_SWSUSP is set).
>
> Signed-off-by: Rafael J. Wysocki <rjw@...k.pl>
> ---
> kernel/power/Kconfig | 40 ++++++++++++++++++++++++++++++----------
> 1 file changed, 30 insertions(+), 10 deletions(-)
>
> Index: linux-2.6/kernel/power/Kconfig
> ===================================================================
> --- linux-2.6.orig/kernel/power/Kconfig 2007-07-30 07:58:48.000000000 +0200
> +++ linux-2.6/kernel/power/Kconfig 2007-08-04 00:39:21.000000000 +0200
> @@ -72,15 +72,10 @@ config PM_TRACE
> CAUTION: this option will cause your machine's real-time clock to be
> set to an invalid time after a resume.
>
> -config SUSPEND_SMP_POSSIBLE
> - bool
> - depends on (X86 && !X86_VOYAGER) || (PPC64 && (PPC_PSERIES || PPC_PMAC))
> - depends on SMP
> - default y
> -
> -config SUSPEND_SMP
> +config PM_SLEEP_SMP
> bool
> - depends on SUSPEND_SMP_POSSIBLE && PM_SLEEP
> + depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
> + depends on PM_SLEEP
> select HOTPLUG_CPU
> default y
>
> @@ -89,20 +84,45 @@ config PM_SLEEP
> depends on SUSPEND || HIBERNATION
> default y
>
> +config SUSPEND_UP_POSSIBLE
> + bool
> + depends on BLACKFIN || MIPS || SUPERH || FRV || (PPC32 && PPC_MPC52xx)
please include (X86 && !X86_VOYAGER) here -- else you'll disable
SUSPEND from all X86 when built UP.
thanks,
-Len
-
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