Re: [PATCH v2] pm: Move nvs routines into a seperate file.

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Thursday 11 June 2009, Heiko Carstens wrote:
> On Wed, Jun 10, 2009 at 01:09:19AM +0200, Rafael J. Wysocki wrote:
> > On Tuesday 09 June 2009, Cornelia Huck wrote:
> > > The *_nvs_* routines in swsusp.c make use of the io*map()
> > > functions, which are only provided for HAS_IOMEM, thus
> > > breaking compilation if HAS_IOMEM is not set. Fix this
> > > by moving the *_nvs_* routines into hibernation_nvs.c, which
> > > is only compiled if HAS_IOMEM is set.
> > > 
> > > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> > 
> > Thanks, I added the GPLv2 line to the header comment and changed the name
> > of the file to hibernate_nvs.c (to match the other changes in the works).
> > 
> > I'll carry out some compilation testing on it and put it into the tree shortly.
> 
> Rafael, could you add the patch below as well?
> Or should that go in via git390?
> 
> Subject: [PATCH] PM: add empty suspend/resume device irq functions
> 
> From: Heiko Carstens <heiko.carstens@de.ibm.com>
> 
> git commit 0a0c5168 "PM: Introduce functions for suspending and resuming
> device interrupts" introduced some helper functions. However these
> functions are only available for architectures which support
> GENERIC_HARDIRQS.
> 
> Other architectures will see this build error:
> 
> drivers/built-in.o: In function `sysdev_suspend':
> (.text+0x15138): undefined reference to `check_wakeup_irqs'
> drivers/built-in.o: In function `device_power_up':
> (.text+0x1cb66): undefined reference to `resume_device_irqs'
> drivers/built-in.o: In function `device_power_down':
> (.text+0x1cb92): undefined reference to `suspend_device_irqs'
> 
> To fix this add some empty inline functions for !GENERIC_HARDIRQS.
> 
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
> 
>  include/linux/interrupt.h |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff -urpN linux-2.6/include/linux/interrupt.h linux-2.6-patched/include/linux/interrupt.h
> --- linux-2.6/include/linux/interrupt.h	2009-06-11 13:07:46.000000000 +0200
> +++ linux-2.6-patched/include/linux/interrupt.h	2009-06-11 13:08:31.000000000 +0200
> @@ -183,6 +183,7 @@ extern void disable_irq(unsigned int irq
>  extern void enable_irq(unsigned int irq);
>  
>  /* The following three functions are for the core kernel use only. */
> +#ifdef CONFIG_GENERIC_HARDIRQS
>  extern void suspend_device_irqs(void);
>  extern void resume_device_irqs(void);
>  #ifdef CONFIG_PM_SLEEP
> @@ -190,6 +191,11 @@ extern int check_wakeup_irqs(void);
>  #else
>  static inline int check_wakeup_irqs(void) { return 0; }
>  #endif
> +#else
> +static inline void suspend_device_irqs(void) { };
> +static inline void resume_device_irqs(void) { };
> +static inline int check_wakeup_irqs(void) { return 0; }
> +#endif
>  
>  #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)

Added, thanks a lot for the patch!

Best,
Rafael