From 5cdf1052676fce5b9a380c07088a03e097e54a8e Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 25 Jun 2005 14:55:14 -0700
Subject: [PATCH] --- yaml --- r: 3251 b: refs/heads/master c:
 c61978b30322c83a94d7e4857fa5b9996b7d7931 h: refs/heads/master i:   3249:
 84a26dcac60cafdeefd69a7202ddbecef5c599a2   3247:
 db1ed536c4219ddffa5dff052b9f7196b75b596c v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/power/swsusp.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3604741be182..2a1a2136470f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e4d5822dc71f01bf515b8f6f4e41ae12ee785b8
+refs/heads/master: c61978b30322c83a94d7e4857fa5b9996b7d7931
diff --git a/trunk/kernel/power/swsusp.c b/trunk/kernel/power/swsusp.c
index 9a3ca659a436..c285fc5a2320 100644
--- a/trunk/kernel/power/swsusp.c
+++ b/trunk/kernel/power/swsusp.c
@@ -781,18 +781,18 @@ static int swsusp_alloc(void)
 {
 	int error;
 
+	pagedir_nosave = NULL;
+	nr_copy_pages = calc_nr(nr_copy_pages);
+
 	pr_debug("suspend: (pages needed: %d + %d free: %d)\n",
 		 nr_copy_pages, PAGES_FOR_IO, nr_free_pages());
 
-	pagedir_nosave = NULL;
 	if (!enough_free_mem())
 		return -ENOMEM;
 
 	if (!enough_swap())
 		return -ENOSPC;
 
-	nr_copy_pages = calc_nr(nr_copy_pages);
-
 	if (!(pagedir_save = alloc_pagedir(nr_copy_pages))) {
 		printk(KERN_ERR "suspend: Allocating pagedir failed.\n");
 		return -ENOMEM;