diff options
Diffstat (limited to 'kernel/power')
-rw-r--r-- | kernel/power/snapshot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 1b84313cbab5..99f9b7d177d6 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c | |||
@@ -906,7 +906,7 @@ static void init_header(struct swsusp_info *info) | |||
906 | memset(info, 0, sizeof(struct swsusp_info)); | 906 | memset(info, 0, sizeof(struct swsusp_info)); |
907 | info->version_code = LINUX_VERSION_CODE; | 907 | info->version_code = LINUX_VERSION_CODE; |
908 | info->num_physpages = num_physpages; | 908 | info->num_physpages = num_physpages; |
909 | memcpy(&info->uts, &system_utsname, sizeof(system_utsname)); | 909 | memcpy(&info->uts, init_utsname(), sizeof(struct new_utsname)); |
910 | info->cpus = num_online_cpus(); | 910 | info->cpus = num_online_cpus(); |
911 | info->image_pages = nr_copy_pages; | 911 | info->image_pages = nr_copy_pages; |
912 | info->pages = nr_copy_pages + nr_meta_pages + 1; | 912 | info->pages = nr_copy_pages + nr_meta_pages + 1; |
@@ -1050,13 +1050,13 @@ static inline int check_header(struct swsusp_info *info) | |||
1050 | reason = "kernel version"; | 1050 | reason = "kernel version"; |
1051 | if (info->num_physpages != num_physpages) | 1051 | if (info->num_physpages != num_physpages) |
1052 | reason = "memory size"; | 1052 | reason = "memory size"; |
1053 | if (strcmp(info->uts.sysname,system_utsname.sysname)) | 1053 | if (strcmp(info->uts.sysname,init_utsname()->sysname)) |
1054 | reason = "system type"; | 1054 | reason = "system type"; |
1055 | if (strcmp(info->uts.release,system_utsname.release)) | 1055 | if (strcmp(info->uts.release,init_utsname()->release)) |
1056 | reason = "kernel release"; | 1056 | reason = "kernel release"; |
1057 | if (strcmp(info->uts.version,system_utsname.version)) | 1057 | if (strcmp(info->uts.version,init_utsname()->version)) |
1058 | reason = "version"; | 1058 | reason = "version"; |
1059 | if (strcmp(info->uts.machine,system_utsname.machine)) | 1059 | if (strcmp(info->uts.machine,init_utsname()->machine)) |
1060 | reason = "machine"; | 1060 | reason = "machine"; |
1061 | if (reason) { | 1061 | if (reason) { |
1062 | printk(KERN_ERR "swsusp: Resume mismatch: %s\n", reason); | 1062 | printk(KERN_ERR "swsusp: Resume mismatch: %s\n", reason); |