Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760453AbZFKVMT (ORCPT ); Thu, 11 Jun 2009 17:12:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754732AbZFKVMG (ORCPT ); Thu, 11 Jun 2009 17:12:06 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:40684 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753319AbZFKVME (ORCPT ); Thu, 11 Jun 2009 17:12:04 -0400 Date: Thu, 11 Jun 2009 23:11:57 +0200 From: Pavel Machek To: Heiko Carstens Cc: "Rafael J. Wysocki" , Cornelia Huck , Martin Schwidefsky , linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-pm@lists.linux-foundation.org, Ingo Molnar Subject: Re: [PATCH v2] pm: Move nvs routines into a seperate file. Message-ID: <20090611211157.GD27376@elf.ucw.cz> References: <20090604161847.513682672@de.ibm.com> <200906082048.28779.rjw@sisk.pl> <20090609104003.50830165@gondolin> <200906100109.20470.rjw@sisk.pl> <20090611133218.GB3146@osiris.boeblingen.de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090611133218.GB3146@osiris.boeblingen.de.ibm.com> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2344 Lines: 54 On Thu 2009-06-11 15:32:18, 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. I don't think that's right fix. If architecture does not use GENERIC_HARDIRQS, it may want to implement *_device_irqs() itself. Before your patch, it could, after your patch, it can not. Better put those empty functions in arch/s390/include? Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- 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/