Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / arch / x86 / kernel / suspend_asm_64.S

diff --git a/arch/x86/kernel/suspend_asm_64.S b/arch/x86/kernel/suspend_asm_64.S
index 40a209e0525cce8fb7d1a8e8acf7318fea3e9813..48344b666d2c2e60f56d3393d82ecc48e0b9388f 100644 (file)
--- 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