aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/suspend_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/suspend_64.c')
-rw-r--r--arch/x86/kernel/suspend_64.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c
index 01fbfb018ca9..da10eef4c3ef 100644
--- a/arch/x86/kernel/suspend_64.c
+++ b/arch/x86/kernel/suspend_64.c
@@ -156,6 +156,12 @@ extern int restore_image(void);
156 */ 156 */
157unsigned long restore_jump_address; 157unsigned long restore_jump_address;
158 158
159/*
160 * Value of the cr3 register from before the hibernation (this value is passed
161 * in the image header).
162 */
163unsigned long restore_cr3;
164
159pgd_t *temp_level4_pgt; 165pgd_t *temp_level4_pgt;
160 166
161void *relocated_restore_code; 167void *relocated_restore_code;
@@ -254,7 +260,8 @@ int pfn_is_nosave(unsigned long pfn)
254 260
255struct restore_data_record { 261struct restore_data_record {
256 unsigned long jump_address; 262 unsigned long jump_address;
257 unsigned long control; 263 unsigned long cr3;
264 unsigned long magic;
258}; 265};
259 266
260#define RESTORE_MAGIC 0x0123456789ABCDEFUL 267#define RESTORE_MAGIC 0x0123456789ABCDEFUL
@@ -271,7 +278,8 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size)
271 if (max_size < sizeof(struct restore_data_record)) 278 if (max_size < sizeof(struct restore_data_record))
272 return -EOVERFLOW; 279 return -EOVERFLOW;
273 rdr->jump_address = restore_jump_address; 280 rdr->jump_address = restore_jump_address;
274 rdr->control = (restore_jump_address ^ RESTORE_MAGIC); 281 rdr->cr3 = restore_cr3;
282 rdr->magic = RESTORE_MAGIC;
275 return 0; 283 return 0;
276} 284}
277 285
@@ -285,7 +293,7 @@ int arch_hibernation_header_restore(void *addr)
285 struct restore_data_record *rdr = addr; 293 struct restore_data_record *rdr = addr;
286 294
287 restore_jump_address = rdr->jump_address; 295 restore_jump_address = rdr->jump_address;
288 return (rdr->control == (restore_jump_address ^ RESTORE_MAGIC)) ? 296 restore_cr3 = rdr->cr3;
289 0 : -EINVAL; 297 return (rdr->magic == RESTORE_MAGIC) ? 0 : -EINVAL;
290} 298}
291#endif /* CONFIG_HIBERNATION */ 299#endif /* CONFIG_HIBERNATION */