build uml

[linux-2.6.git] / arch / x86_64 / kernel / suspend_asm.S

diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86_64/kernel/suspend_asm.S
index 633a869..320b6fb 100644 (file)
--- a/arch/x86_64/kernel/suspend_asm.S
+++ b/arch/x86_64/kernel/suspend_asm.S
@@ -14,7 +14,7 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 
 ENTRY(swsusp_arch_suspend)
 
@@ -39,12 +39,13 @@ ENTRY(swsusp_arch_suspend)
        call swsusp_save
        ret
 
-ENTRY(swsusp_arch_resume)
-       /* set up cr3 */        
-       leaq    init_level4_pgt(%rip),%rax
-       subq    $__START_KERNEL_map,%rax
-       movq    %rax,%cr3
-
+ENTRY(restore_image)
+       /* switch to temporary page tables */
+       movq    $__PAGE_OFFSET, %rdx
+       movq    temp_level4_pgt(%rip), %rax
+       subq    %rdx, %rax
+       movq    %rax, %cr3
+       /* Flush TLB */
        movq    mmu_cr4_features(%rip), %rax
        movq    %rax, %rdx
        andq    $~(1<<7), %rdx  # PGE
@@ -54,16 +55,10 @@ ENTRY(swsusp_arch_resume)
        movq    %rax, %cr4;  # turn PGE back on
 
        movq    pagedir_nosave(%rip), %rdx
-       /* compute the limit */
-       movl    nr_copy_pages(%rip), %eax
-       testl   %eax, %eax
-       jz      done
-       movq    %rdx,%r8
-       movl    $SIZEOF_PBE,%r9d
-       mul             %r9  # with rax, clobbers rdx
-       movq    %r8, %rdx
-       addq    %r8, %rax
 loop:
+       testq   %rdx, %rdx
+       jz      done
+
        /* get addresses from the pbe and copy the page */
        movq    pbe_address(%rdx), %rsi
        movq    pbe_orig_address(%rdx), %rdi
@@ -72,16 +67,28 @@ loop:
        movsq
 
        /* progress to the next pbe */
-       addq    $SIZEOF_PBE, %rdx
-       cmpq    %rax, %rdx
-       jb      loop
+       movq    pbe_next(%rdx), %rdx
+       jmp     loop
 done:
+       /* go back to the original page tables */
+       leaq    init_level4_pgt(%rip), %rax
+       subq    $__START_KERNEL_map, %rax
+       movq    %rax, %cr3
+       /* Flush TLB, including "global" things (vmalloc) */
+       movq    mmu_cr4_features(%rip), %rax
+       movq    %rax, %rdx
+       andq    $~(1<<7), %rdx;  # PGE
+       movq    %rdx, %cr4;  # turn off PGE
+       movq    %cr3, %rcx;  # flush TLB
+       movq    %rcx, %cr3
+       movq    %rax, %cr4;  # turn PGE back on
+
        movl    $24, %eax
        movl    %eax, %ds
 
        movq saved_context_esp(%rip), %rsp
        movq saved_context_ebp(%rip), %rbp
-       movq saved_context_eax(%rip), %rax
+       /* Don't restore %rax, it must be 0 anyway */
        movq saved_context_ebx(%rip), %rbx
        movq saved_context_ecx(%rip), %rcx
        movq saved_context_edx(%rip), %rdx
@@ -96,5 +103,7 @@ done:
        movq saved_context_r14(%rip), %r14
        movq saved_context_r15(%rip), %r15
        pushq saved_context_eflags(%rip) ; popfq
-       call    swsusp_restore
+
+       xorq    %rax, %rax
+
        ret