Re: [PATCH v2] OLPC: Add XO-1 suspend/resume support

[Andres Salomon <dilinger@queued.net>]

On Wed, 20 Oct 2010 09:06:13 -0700
Andres Salomon <dilinger@queued.net> wrote:

> On Wed, 20 Oct 2010 16:17:23 +0100 (BST)
> Daniel Drake <dsd@laptop.org> wrote:
> 
> > Add code needed for basic suspend/resume of the XO-1 laptop.
> > 
> > Signed-off-by: Daniel Drake <dsd@laptop.org>
> > ---
> >  arch/x86/Kconfig                  |    2 +-
> >  arch/x86/include/asm/olpc.h       |    5 +-
> >  arch/x86/kernel/Makefile          |    2 +-
> >  arch/x86/kernel/olpc-xo1-wakeup.S |  133
> > +++++++++++++++++++++++++++++++++++++
> > arch/x86/kernel/olpc-xo1.c        |   79 ++++++++++++++++++++++ 5
> > files changed, 218 insertions(+), 3 deletions(-) create mode 100644
> > arch/x86/kernel/olpc-xo1-wakeup.S
> > 
> > v2: add dependency on CONFIG_PM_SLEEP (thanks Randy), avoid
> > requirement on hacking swsusp_pg_dir by switching to
> > initial_page_table Depends on the following patch:
> > x86-32, mm: Add an initial page table for core bootstrapping
> > 
> > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> > index 6a81891..581abc7 100644
> > --- a/arch/x86/Kconfig
> > +++ b/arch/x86/Kconfig
> > @@ -2036,7 +2036,7 @@ config OLPC
> >  
> >  config OLPC_XO1
> >  	tristate "OLPC XO-1 support"
> > -	depends on OLPC && PCI
> > +	depends on OLPC && PCI && PM_SLEEP
> >  	---help---
> 
> 
> My suggestion would be:
> 
> config OLPC_XO1_PM
> 	bool
> 	depends on OLPC && PCI && PM_SLEEP
> 	default y
> 
> 
> No help necessary; just silently turn it on if PM_SLEEP is enabled,
> but don't make all OLPC support dependent upon PM_SLEEP.

Actually, scratch that; I didn't realize that CONFIG_OLPC !=
CONFIG_OLPC_XO1.  The config looks fine the way you proposed.