Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760380AbZFKT5k (ORCPT ); Thu, 11 Jun 2009 15:57:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755098AbZFKT5c (ORCPT ); Thu, 11 Jun 2009 15:57:32 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:53842 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752505AbZFKT5b (ORCPT ); Thu, 11 Jun 2009 15:57:31 -0400 From: "Rafael J. Wysocki" To: Heiko Carstens Subject: Re: [PATCH v2] pm: Move nvs routines into a seperate file. Date: Thu, 11 Jun 2009 21:58:06 +0200 User-Agent: KMail/1.11.2 (Linux/2.6.30-rc8-rjw; KDE/4.2.4; x86_64; ; ) Cc: Cornelia Huck , Pavel Machek , Martin Schwidefsky , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-pm@lists.linux-foundation.org, Ingo Molnar References: <20090604161847.513682672@de.ibm.com> <200906100109.20470.rjw@sisk.pl> <20090611133218.GB3146@osiris.boeblingen.de.ibm.com> In-Reply-To: <20090611133218.GB3146@osiris.boeblingen.de.ibm.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200906112158.07490.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3122 Lines: 77 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 > > > > 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 > > 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 > --- > > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/