Re: [PATCH 2/3] swsusp: Do not use page flags

Rafael J. Wysocki
2007-03-20T21:26:31Z

On Tuesday, 20 March 2007 01:31, Andrew Morton wrote:
> On Mon, 12 Mar 2007 22:19:20 +0100
> "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> > Make swsusp use memory bitmaps instead of page flags for marking 'nosave' and
> > free pages. This allows us to 'recycle' two page flags that can be used for other
> > purposes. Also, the memory needed to store the bitmaps is allocated when
> > necessary (ie. before the suspend) and freed after the resume which is more
> > reasonable.
> >
> > The patch is designed to minimize the amount of changes and there are some nice
> > simplifications and optimizations possible on top of it. I am going to
> > implement them separately in the future.
>
> Blows up with ia64 allmodconfig due to CONFIG_PM=y, CONFIG_SOFTWARE_SUSPEND=n:
>
> kernel/power/main.c:223: error: redefinition of 'software_suspend'
> include/linux/suspend.h:46: error: previous definition of 'software_suspend' was here
>
> I had a look at fixing it, but it's unobvious why we're compiling most of
> kernel/power/main.c when CONFIG_SOFTWARE_SUSPEND=n so I'll send this series
> back for repair please.

Well, it was sufficient to add #ifdef CONFIG_SOFTWARE_SUSPEND around the
definition of software_suspend() in kernel/power/main.c.

The following series of patches compiles with CONFIG_SOFTWARE_SUSPEND=n too.

Greetings,
Rafael