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 Mon, 8 Jun 2009 08:35:01 +0200,
    Pavel Machek <pavel@ucw.cz> wrote:

    > 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.

    hibernate_nvs.c?

    >
    > > @@ -0,0 +1,131 @@
    > > +/*
    > > + * Routines for NVS memory handling
    > > + */
    >
    > If you copy&pasted code, you need to copy&paste copyright notices, too.

    Which ones? Rafael, it seems you wrote the NVS code - which copyright
    should I use?

    >
    > > --- 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?

    It's a hidden config variable - but I can change it to
    CONFIG_HIBERNATION_NVS.


    \
     
     \ /
      Last update: 2009-06-08 17:39    [W:4.252 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site