On Thu 2009-06-04 18:18:48, Martin Schwidefsky wrote: > From: Cornelia Huck <cornelia.huck@xxxxxxxxxx> > > 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 nvs.c, which is only > compiled if HAS_IOMEM is set. > > Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx> > Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> > --- > include/linux/suspend.h | 18 ++++-- > kernel/power/Kconfig | 4 + > kernel/power/Makefile | 1 > kernel/power/nvs.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++ > kernel/power/swsusp.c | 122 -------------------------------------------- > 5 files changed, 147 insertions(+), 129 deletions(-) > > Index: linux-2.6/kernel/power/nvs.c > =================================================================== > --- /dev/null > +++ linux-2.6/kernel/power/nvs.c Ideally, filename would be a bit more descriptive. > @@ -0,0 +1,131 @@ > +/* > + * Routines for NVS memory handling > + */ If you copy&pasted code, you need to copy&paste copyright notices, too. > --- linux-2.6.orig/kernel/power/Makefile > +++ linux-2.6/kernel/power/Makefile > @@ -7,5 +7,6 @@ obj-$(CONFIG_PM) += main.o > obj-$(CONFIG_PM_SLEEP) += console.o > obj-$(CONFIG_FREEZER) += process.o > obj-$(CONFIG_HIBERNATION) += swsusp.o disk.o snapshot.o swap.o user.o > +obj-$(CONFIG_NVS) += nvs.o > > obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o CONFIG_NVS is definitely not descriptive enough. C_HIBERNATION_NVS? -- (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-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
