[<prev] [next>] [day] [month] [year] [list]
Message-ID: <4BFCC948.8010603@crca.org.au>
Date: Wed, 26 May 2010 17:10:00 +1000
From: Nigel Cunningham <ncunningham@...a.org.au>
To: "Rafael J. Wysocki" <rjw@...k.pl>,
pm list <linux-pm@...ts.linux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>,
TuxOnIce-devel <tuxonice-devel@...ts.tuxonice.net>
Subject: [PATCH 2/5] Move root swap declaration.
Move the declaration of root_swap in preparation for the
next patch.
Signed-off-by: Nigel Cunningham <nigel@...onice.net>
---
kernel/power/swap.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 829f7b4..e555b6c 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -63,6 +63,8 @@ struct swap_map_handle {
unsigned int k;
};
+static unsigned short root_swap = 0xffff;
+
struct swsusp_header {
char reserved[PAGE_SIZE - 20 - sizeof(sector_t) - sizeof(int)];
sector_t image;
@@ -217,7 +219,6 @@ int swsusp_swap_in_use(void)
* General things
*/
-static unsigned short root_swap = 0xffff;
struct block_device *hib_resume_bdev;
/*
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists