diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-10-18 06:04:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:19 -0400 |
commit | c30bb68c26ad7e9277f2d1dfed8347f329e1cf27 (patch) | |
tree | 6609a9a69446f58d076dadd452b250db732be47b /arch/x86/kernel/suspend_asm_64.S | |
parent | d158cbdf39ffaec9dd5299fdfdfdd2c7897a71dc (diff) |
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 40a209e0525..48344b666d2 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) | |||
39 | /* save the address of restore_registers */ | 39 | /* save the address of restore_registers */ |
40 | movq $restore_registers, %rax | 40 | movq $restore_registers, %rax |
41 | movq %rax, restore_jump_address(%rip) | 41 | movq %rax, restore_jump_address(%rip) |
42 | /* save cr3 */ | ||
43 | movq %cr3, %rax | ||
44 | movq %rax, restore_cr3(%rip) | ||
42 | 45 | ||
43 | call swsusp_save | 46 | call swsusp_save |
44 | ret | 47 | ret |
@@ -60,6 +63,7 @@ ENTRY(restore_image) | |||
60 | 63 | ||
61 | /* prepare to jump to the image kernel */ | 64 | /* prepare to jump to the image kernel */ |
62 | movq restore_jump_address(%rip), %rax | 65 | movq restore_jump_address(%rip), %rax |
66 | movq restore_cr3(%rip), %rbx | ||
63 | 67 | ||
64 | /* prepare to copy image data to their original locations */ | 68 | /* prepare to copy image data to their original locations */ |
65 | movq restore_pblist(%rip), %rdx | 69 | movq restore_pblist(%rip), %rdx |
@@ -98,9 +102,7 @@ done: | |||
98 | 102 | ||
99 | ENTRY(restore_registers) | 103 | ENTRY(restore_registers) |
100 | /* go back to the original page tables */ | 104 | /* go back to the original page tables */ |
101 | movq $(init_level4_pgt - __START_KERNEL_map), %rax | 105 | movq %rbx, %cr3 |
102 | addq phys_base(%rip), %rax | ||
103 | movq %rax, %cr3 | ||
104 | 106 | ||
105 | /* Flush TLB, including "global" things (vmalloc) */ | 107 | /* Flush TLB, including "global" things (vmalloc) */ |
106 | movq mmu_cr4_features(%rip), %rax | 108 | movq mmu_cr4_features(%rip), %rax |