Re: mmotm 2010-07-01 pm_get_wakeup_count() declaration

[Valdis . Kletnieks]

On Mon, 05 Jul 2010 22:43:55 +0200, "Rafael J. Wysocki" said:
> On Monday, July 05, 2010, Valdis.Kletnieks@xxxxxx wrote:
> > On Thu, 01 Jul 2010 12:19:51 PDT, akpm@xxxxxxxxxxxxxxxxxxxx said:
> > > The mm-of-the-moment snapshot 2010-07-01-12-19 has been uploaded to
> > 
> > Not sure who to blame for the commit, it was in the linux-next.patch and I'm
> > too lazy to pull down the git tree and dig it out.
> > 
> >   CC      kernel/power/main.o
> > kernel/power/main.c: In function 'wakeup_count_show':
> > kernel/power/main.c:241: error: implicit declaration of function 'pm_get_wakeup_count'
> > kernel/power/main.c: In function 'wakeup_count_store':
> > kernel/power/main.c:251: error: implicit declaration of function 'pm_save_wakeup_count'
> > make[2]: *** [kernel/power/main.o] Error 1
> > 
> > Problem is that declaration in include/linux/suspend.h is wrapped in
> > a #ifdef CONFIG_PM_SLEEP, but the usage in kernel/power/main.c isn't. So
> > it dies a horrid death if your config doesn't include PM_SLEEP.
> 
> Yeah, sorry.  I'm in the process of fixing it up.

I threw in some ad-crock #ifdef to get past that one, and hit
another one, same basic issue but include/linux/pm.h this time:

  CC      drivers/base/power/sysfs.o
drivers/base/power/sysfs.c: In function 'wakeup_count_show':
drivers/base/power/sysfs.c:152: error: 'struct dev_pm_info' has no member named 'wakeup_count'
make[3]: *** [drivers/base/power/sysfs.o] Error 1

Attachment: pgp00000.pgp
Description: PGP signature