lkml.org 
[lkml]   [2009]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [patch 01/38] pm: Move nvs routines into a seperate file.
    On Thu 2009-06-04 18:18:48, Martin Schwidefsky wrote:
    > From: Cornelia Huck <cornelia.huck@de.ibm.com>
    >
    > 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@de.ibm.com>
    > Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    > ---
    > 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


    \
     
     \ /
      Last update: 2009-06-08 17:23    [W:0.021 / U:122.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site