3 files changed, 29 insertions, 29 deletions

diff --git a/kernel/power/power.h b/kernel/power/power.h
index 5f842c3efc4b..33bd94ceba32 100644
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -23,6 +23,8 @@ static inline int pm_suspend_disk(void)
 }
 #endif
 
+extern int pfn_is_nosave(unsigned long);
+
 extern struct mutex pm_mutex;
 
 #define power_attr(_name) \
@@ -37,9 +39,6 @@ static struct subsys_attribute _name##_attr = {	\
 
 extern struct kset power_subsys;
 
-/* References to section boundaries */
-extern const void __nosave_begin, __nosave_end;
-
 /* Preferred image size in bytes (default 500 MB) */
 extern unsigned long image_size;
 extern int in_suspend;
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index fc53ad068128..704c25a3ffec 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -651,17 +651,6 @@ static inline unsigned int count_highmem_pages(void) { return 0; }
 #endif /* CONFIG_HIGHMEM */
 
 /**
- *      pfn_is_nosave - check if given pfn is in the 'nosave' section
- */
-
-static inline int pfn_is_nosave(unsigned long pfn)
-{
-        unsigned long nosave_begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT;
-        unsigned long nosave_end_pfn = PAGE_ALIGN(__pa(&__nosave_end)) >> PAGE_SHIFT;
-        return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn);
-}
-
-/**
  *      saveable - Determine whether a non-highmem page should be included in
  *      the suspend image.
  *
diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 3581f8f86acd..b18c155cbb60 100644
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -33,12 +33,14 @@ extern char resume_file[];
 
 #define SWSUSP_SIG      "S1SUSPEND"
 
-static struct swsusp_header {
+struct swsusp_header {
         char reserved[PAGE_SIZE - 20 - sizeof(sector_t)];
         sector_t image;
         char    orig_sig[10];
         char    sig[10];
-} __attribute__((packed, aligned(PAGE_SIZE))) swsusp_header;
+} __attribute__((packed));
+
+static struct swsusp_header *swsusp_header;
 
 /*
  * General things
@@ -141,14 +143,14 @@ static int mark_swapfiles(sector_t start)
 {
         int error;
 
-        bio_read_page(swsusp_resume_block, &swsusp_header, NULL);
-        if (!memcmp("SWAP-SPACE",swsusp_header.sig, 10) ||
-            !memcmp("SWAPSPACE2",swsusp_header.sig, 10)) {
-                memcpy(swsusp_header.orig_sig,swsusp_header.sig, 10);
-                memcpy(swsusp_header.sig,SWSUSP_SIG, 10);
-                swsusp_header.image = start;
+        bio_read_page(swsusp_resume_block, swsusp_header, NULL);
+        if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
+            !memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
+                memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
+                memcpy(swsusp_header->sig,SWSUSP_SIG, 10);
+                swsusp_header->image = start;
                 error = bio_write_page(swsusp_resume_block,
-                                        &swsusp_header, NULL);
+                                        swsusp_header, NULL);
         } else {
                 printk(KERN_ERR "swsusp: Swap header not found!\n");
                 error = -ENODEV;
@@ -564,7 +566,7 @@ int swsusp_read(void)
         if (error < PAGE_SIZE)
                 return error < 0 ? error : -EFAULT;
         header = (struct swsusp_info *)data_of(snapshot);
-        error = get_swap_reader(&handle, swsusp_header.image);
+        error = get_swap_reader(&handle, swsusp_header->image);
         if (!error)
                 error = swap_read_page(&handle, header, NULL);
         if (!error)
@@ -591,17 +593,17 @@ int swsusp_check(void)
         resume_bdev = open_by_devnum(swsusp_resume_device, FMODE_READ);
         if (!IS_ERR(resume_bdev)) {
                 set_blocksize(resume_bdev, PAGE_SIZE);
-                memset(&swsusp_header, 0, sizeof(swsusp_header));
+                memset(swsusp_header, 0, sizeof(PAGE_SIZE));
                 error = bio_read_page(swsusp_resume_block,
-                                        &swsusp_header, NULL);
+                                        swsusp_header, NULL);
                 if (error)
                         return error;
 
-                if (!memcmp(SWSUSP_SIG, swsusp_header.sig, 10)) {
-                        memcpy(swsusp_header.sig, swsusp_header.orig_sig, 10);
+                if (!memcmp(SWSUSP_SIG, swsusp_header->sig, 10)) {
+                        memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10);
                         /* Reset swap signature now */
                         error = bio_write_page(swsusp_resume_block,
-                                                &swsusp_header, NULL);
+                                                swsusp_header, NULL);
                 } else {
                         return -EINVAL;
                 }
@@ -632,3 +634,13 @@ void swsusp_close(void)
 
         blkdev_put(resume_bdev);
 }
+
+static int swsusp_header_init(void)
+{
+        swsusp_header = (struct swsusp_header*) __get_free_page(GFP_KERNEL);
+        if (!swsusp_header)
+                panic("Could not allocate memory for swsusp_header\n");
+        return 0;
+}
+
+core_initcall(swsusp_header_init);