1 files changed, 18 insertions, 13 deletions

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 78039b477d2b..f6a5df934f8d 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -635,7 +635,7 @@ __register_nosave_region(unsigned long start_pfn, unsigned long end_pfn,
         region->end_pfn = end_pfn;
         list_add_tail(&region->list, &nosave_regions);
  Report:
-        printk("swsusp: Registered nosave memory region: %016lx - %016lx\n",
+        printk(KERN_INFO "PM: Registered nosave memory: %016lx - %016lx\n",
                 start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT);
 }
 
@@ -704,7 +704,7 @@ static void mark_nosave_pages(struct memory_bitmap *bm)
         list_for_each_entry(region, &nosave_regions, list) {
                 unsigned long pfn;
 
-                printk("swsusp: Marking nosave pages: %016lx - %016lx\n",
+                pr_debug("PM: Marking nosave pages: %016lx - %016lx\n",
                                 region->start_pfn << PAGE_SHIFT,
                                 region->end_pfn << PAGE_SHIFT);
 
@@ -749,7 +749,7 @@ int create_basic_memory_bitmaps(void)
         free_pages_map = bm2;
         mark_nosave_pages(forbidden_pages_map);
 
-        printk("swsusp: Basic memory bitmaps created\n");
+        pr_debug("PM: Basic memory bitmaps created\n");
 
         return 0;
 
@@ -784,7 +784,7 @@ void free_basic_memory_bitmaps(void)
         memory_bm_free(bm2, PG_UNSAFE_CLEAR);
         kfree(bm2);
 
-        printk("swsusp: Basic memory bitmaps freed\n");
+        pr_debug("PM: Basic memory bitmaps freed\n");
 }
 
 /**
@@ -872,7 +872,6 @@ unsigned int count_highmem_pages(void)
 }
 #else
 static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; }
-static inline unsigned int count_highmem_pages(void) { return 0; }
 #endif /* CONFIG_HIGHMEM */
 
 /**
@@ -1089,7 +1088,7 @@ static int enough_free_mem(unsigned int nr_pages, unsigned int nr_highmem)
         }
 
         nr_pages += count_pages_for_highmem(nr_highmem);
-        pr_debug("swsusp: Normal pages needed: %u + %u + %u, available pages: %u\n",
+        pr_debug("PM: Normal pages needed: %u + %u + %u, available pages: %u\n",
                 nr_pages, PAGES_FOR_IO, meta, free);
 
         return free > nr_pages + PAGES_FOR_IO + meta;
@@ -1202,20 +1201,20 @@ asmlinkage int swsusp_save(void)
 {
         unsigned int nr_pages, nr_highmem;
 
-        printk("swsusp: critical section: \n");
+        printk(KERN_INFO "PM: Creating hibernation image: \n");
 
         drain_local_pages();
         nr_pages = count_data_pages();
         nr_highmem = count_highmem_pages();
-        printk("swsusp: Need to copy %u pages\n", nr_pages + nr_highmem);
+        printk(KERN_INFO "PM: Need to copy %u pages\n", nr_pages + nr_highmem);
 
         if (!enough_free_mem(nr_pages, nr_highmem)) {
-                printk(KERN_ERR "swsusp: Not enough free memory\n");
+                printk(KERN_ERR "PM: Not enough free memory\n");
                 return -ENOMEM;
         }
 
         if (swsusp_alloc(&orig_bm, &copy_bm, nr_pages, nr_highmem)) {
-                printk(KERN_ERR "swsusp: Memory allocation failed\n");
+                printk(KERN_ERR "PM: Memory allocation failed\n");
                 return -ENOMEM;
         }
 
@@ -1235,7 +1234,8 @@ asmlinkage int swsusp_save(void)
         nr_copy_pages = nr_pages;
         nr_meta_pages = DIV_ROUND_UP(nr_pages * sizeof(long), PAGE_SIZE);
 
-        printk("swsusp: critical section: done (%d pages copied)\n", nr_pages);
+        printk(KERN_INFO "PM: Hibernation image created (%d pages copied)\n",
+                nr_pages);
 
         return 0;
 }
@@ -1264,12 +1264,17 @@ static char *check_image_kernel(struct swsusp_info *info)
 }
 #endif /* CONFIG_ARCH_HIBERNATION_HEADER */
 
+unsigned long snapshot_get_image_size(void)
+{
+        return nr_copy_pages + nr_meta_pages + 1;
+}
+
 static int init_header(struct swsusp_info *info)
 {
         memset(info, 0, sizeof(struct swsusp_info));
         info->num_physpages = num_physpages;
         info->image_pages = nr_copy_pages;
-        info->pages = nr_copy_pages + nr_meta_pages + 1;
+        info->pages = snapshot_get_image_size();
         info->size = info->pages;
         info->size <<= PAGE_SHIFT;
         return init_header_complete(info);
@@ -1429,7 +1434,7 @@ static int check_header(struct swsusp_info *info)
         if (!reason && info->num_physpages != num_physpages)
                 reason = "memory size";
         if (reason) {
-                printk(KERN_ERR "swsusp: Resume mismatch: %s\n", reason);
+                printk(KERN_ERR "PM: Image mismatch: %s\n", reason);
                 return -EPERM;
         }
         return 0;