Safer ABI for O_TMPFILE

[linux-beck.git] / kernel / power / snapshot.c

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 0de28576807df9e7dc5be5f05d75a0faa937caf2..349587bb03e1edb64dc5609eee61fdf90a517af0 100644 (file)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -642,8 +642,9 @@ __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(KERN_INFO "PM: Registered nosave memory: %016lx - %016lx\n",
-               start_pfn << PAGE_SHIFT, end_pfn << PAGE_SHIFT);
+       printk(KERN_INFO "PM: Registered nosave memory: [mem %#010llx-%#010llx]\n",
+               (unsigned long long) start_pfn << PAGE_SHIFT,
+               ((unsigned long long) end_pfn << PAGE_SHIFT) - 1);
 }
 
 /*
@@ -1651,7 +1652,7 @@ unsigned long snapshot_get_image_size(void)
 static int init_header(struct swsusp_info *info)
 {
        memset(info, 0, sizeof(struct swsusp_info));
-       info->num_physpages = num_physpages;
+       info->num_physpages = get_num_physpages();
        info->image_pages = nr_copy_pages;
        info->pages = snapshot_get_image_size();
        info->size = info->pages;
@@ -1795,7 +1796,7 @@ static int check_header(struct swsusp_info *info)
        char *reason;
 
        reason = check_image_kernel(info);
-       if (!reason && info->num_physpages != num_physpages)
+       if (!reason && info->num_physpages != get_num_physpages())
                reason = "memory size";
        if (reason) {
                printk(KERN_ERR "PM: Image mismatch: %s\n", reason);