diff options
| author | Rafael J. Wysocki | 2007-10-18 12:04:54 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-18 23:37:19 +0200 |
| commit | c30bb68c26ad7e9277f2d1dfed8347f329e1cf27 (patch) | |
| tree | 6609a9a69446f58d076dadd452b250db732be47b /arch/x86/kernel/suspend_asm_64.S | |
| parent | Hibernation: Arbitrary boot kernel support on x86_64 (diff) | |
| download | kernel-qcow2-linux-c30bb68c26ad7e9277f2d1dfed8347f329e1cf27.tar.gz kernel-qcow2-linux-c30bb68c26ad7e9277f2d1dfed8347f329e1cf27.tar.xz kernel-qcow2-linux-c30bb68c26ad7e9277f2d1dfed8347f329e1cf27.zip | |
Hibernation: Pass CR3 in the image header on x86_64
Since we already pass the address of restore_registers() in the image header,
we can also pass the value of the CR3 register from before the hibernation in
the same way. This will allow us to avoid using init_level4_pgt page tables
during the restore.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/suspend_asm_64.S')
| -rw-r--r-- | arch/x86/kernel/suspend_asm_64.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/suspend_asm_64.S b/arch/x86/kernel/suspend_asm_64.S index 40a209e0525c..48344b666d2c 100644 --- a/arch/x86/kernel/suspend_asm_64.S +++ b/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 |