From 24838ef491e3d4196d5cc3ea78a239eb19c13497 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Thu, 18 Oct 2007 03:04:54 -0700
Subject: [PATCH] --- yaml --- r: 71119 b: refs/heads/master c:
 c30bb68c26ad7e9277f2d1dfed8347f329e1cf27 h: refs/heads/master i:   71117:
 3d59100fda616a3ce8a6eb18408d5526c17295b9   71115:
 53f3368a0211f23907113bbec26f35eded85e9b9   71111:
 e273976c564670e00ad5bab85f7b3bff31c36e93   71103:
 616683540e0e0600d0c42553cdc2b09fec40d2ea v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/suspend_64.c     | 16 ++++++++++++----
 trunk/arch/x86/kernel/suspend_asm_64.S |  8 +++++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 466ce2fd3a79..d9232ef94de9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d158cbdf39ffaec9dd5299fdfdfdd2c7897a71dc
+refs/heads/master: c30bb68c26ad7e9277f2d1dfed8347f329e1cf27
diff --git a/trunk/arch/x86/kernel/suspend_64.c b/trunk/arch/x86/kernel/suspend_64.c
index 01fbfb018ca9..da10eef4c3ef 100644
--- a/trunk/arch/x86/kernel/suspend_64.c
+++ b/trunk/arch/x86/kernel/suspend_64.c
@@ -156,6 +156,12 @@ extern int restore_image(void);
  */
 unsigned long restore_jump_address;
 
+/*
+ * Value of the cr3 register from before the hibernation (this value is passed
+ * in the image header).
+ */
+unsigned long restore_cr3;
+
 pgd_t *temp_level4_pgt;
 
 void *relocated_restore_code;
@@ -254,7 +260,8 @@ int pfn_is_nosave(unsigned long pfn)
 
 struct restore_data_record {
 	unsigned long jump_address;
-	unsigned long control;
+	unsigned long cr3;
+	unsigned long magic;
 };
 
 #define RESTORE_MAGIC	0x0123456789ABCDEFUL
@@ -271,7 +278,8 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size)
 	if (max_size < sizeof(struct restore_data_record))
 		return -EOVERFLOW;
 	rdr->jump_address = restore_jump_address;
-	rdr->control = (restore_jump_address ^ RESTORE_MAGIC);
+	rdr->cr3 = restore_cr3;
+	rdr->magic = RESTORE_MAGIC;
 	return 0;
 }
 
@@ -285,7 +293,7 @@ int arch_hibernation_header_restore(void *addr)
 	struct restore_data_record *rdr = addr;
 
 	restore_jump_address = rdr->jump_address;
-	return (rdr->control == (restore_jump_address ^ RESTORE_MAGIC)) ?
-			0 : -EINVAL;
+	restore_cr3 = rdr->cr3;
+	return (rdr->magic == RESTORE_MAGIC) ? 0 : -EINVAL;
 }
 #endif /* CONFIG_HIBERNATION */
diff --git a/trunk/arch/x86/kernel/suspend_asm_64.S b/trunk/arch/x86/kernel/suspend_asm_64.S
index 40a209e0525c..48344b666d2c 100644
--- a/trunk/arch/x86/kernel/suspend_asm_64.S
+++ b/trunk/arch/x86/kernel/suspend_asm_64.S
@@ -39,6 +39,9 @@ ENTRY(swsusp_arch_suspend)
 	/* save the address of restore_registers */
 	movq	$restore_registers, %rax
 	movq	%rax, restore_jump_address(%rip)
+	/* save cr3 */
+	movq	%cr3, %rax
+	movq	%rax, restore_cr3(%rip)
 
 	call swsusp_save
 	ret
@@ -60,6 +63,7 @@ ENTRY(restore_image)
 
 	/* prepare to jump to the image kernel */
 	movq	restore_jump_address(%rip), %rax
+	movq	restore_cr3(%rip), %rbx
 
 	/* prepare to copy image data to their original locations */
 	movq	restore_pblist(%rip), %rdx
@@ -98,9 +102,7 @@ done:
 
 ENTRY(restore_registers)
 	/* go back to the original page tables */
-	movq    $(init_level4_pgt - __START_KERNEL_map), %rax
-	addq    phys_base(%rip), %rax
-	movq    %rax, %cr3
+	movq    %rbx, %cr3
 
 	/* Flush TLB, including "global" things (vmalloc) */
 	movq	mmu_cr4_features(%rip), %rax