[linux-pm] + pm-convert-wakeup-flag-accessors-to-inline-functions-fix.patch added to -mm tree

[Andrew Morton]

On Wed, 19 Mar 2008 10:55:35 -0400 (EDT) Alan Stern <stern at rowland.harvard.edu> wrote:

> On Tue, 18 Mar 2008 akpm at linux-foundation.org wrote:
> 
> > Subject: pm-convert-wakeup-flag-accessors-to-inline-functions fix
> > From: Andrew Morton <akpm at linux-foundation.org>
> > 
> > ia64 allmodconfig:
> > 
> > In file included from include/linux/device.h:381,
> >                  from include/linux/rtc.h:110,
> >                  from include/linux/efi.h:19,
> >                  from include/asm/sal.h:40,
> >                  from include/asm-ia64/mca.h:20,
> >                  from arch/ia64/kernel/asm-offsets.c:17:
> > include/linux/pm_wakeup.h: In function `device_init_wakeup':
> > include/linux/pm_wakeup.h:35: error: structure has no member named `should_wakeup'
> > include/linux/pm_wakeup.h: In function `device_set_wakeup_enable':
> > include/linux/pm_wakeup.h:45: error: structure has no member named `should_wakeup'
> > include/linux/pm_wakeup.h: In function `device_may_wakeup':
> > include/linux/pm_wakeup.h:50: error: structure has no member named `should_wakeup'
> > 
> > Cc: Alan Stern <stern at rowland.harvard.edu>
> > Cc: Greg KH <greg at kroah.com>
> > Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
> > Cc: Len Brown <lenb at kernel.org>
> > Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
> > ---
> > 
> >  include/linux/pm_wakeup.h |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff -puN include/linux/pm_wakeup.h~pm-convert-wakeup-flag-accessors-to-inline-functions-fix include/linux/pm_wakeup.h
> > --- a/include/linux/pm_wakeup.h~pm-convert-wakeup-flag-accessors-to-inline-functions-fix
> > +++ a/include/linux/pm_wakeup.h
> > @@ -25,7 +25,7 @@
> >  # error "please don't include this file directly"
> >  #endif
> >  
> > -#ifdef CONFIG_PM
> > +#ifdef CONFIG_PM_SLEEP
> >  
> >  /* changes to device_may_wakeup take effect on the next pm state change.
> >   * by default, devices should wakeup if they can.
> 
> This is completely wrong.
> 
> Andrew, I don't know what happened.  But if you go back and compare my
> original patch to the
> pm-make-wakeup-flags-available-whenever-config_pm-is-set patch you
> actually applied, you'll see that you managed to leave out a hunk.  
> Possibly because of a conflict with one of Rafael's patches affecting 
> the same area of code.
> 
> Here's a URL for that patch as rebased by Rafael:
> 
> 	http://marc.info/?l=linux-kernel&m=120528034413861&w=2

But there was a patch with the same title from yourself sent four days
later, which is what I merged.

Plus Greg has been merging and dropping older versions under our feet and
maybe Len has too.

> The very first hunk in that patch makes the should_wakeup flag
> available always, not just when CONFIG_PM_SLEEP is set.  If you go back
> and import it with that first hunk intact then there should be no need 
> for this "fix" patch.

> (In order to do this, you'll first have to revert
> pm-convert-wakeup-flag-accessors-to-inline-functions.patch and then
> re-apply it afterward, because it depends on this one.)

<shudder>

I'll drop everything, let's start again.

Only how?  umm, please review Greg's driver tree, let us know which patches
shoudl be dropped from that then send new ones, I guess.