fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / i386 / power / swsusp.S

diff --git a/arch/i386/power/swsusp.S b/arch/i386/power/swsusp.S
index 8e4a7ba..53662e0 100644 (file)
--- a/arch/i386/power/swsusp.S
+++ b/arch/i386/power/swsusp.S
@@ -12,86 +12,67 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
+#include <asm/asm-offsets.h>
 
        .text
 
-ENTRY(do_magic)
-       pushl %ebx
-       cmpl $0,8(%esp)
-       jne resume
-       call do_magic_suspend_1
-       call save_processor_state
+ENTRY(swsusp_arch_suspend)
 
        movl %esp, saved_context_esp
-       movl %eax, saved_context_eax
        movl %ebx, saved_context_ebx
-       movl %ecx, saved_context_ecx
-       movl %edx, saved_context_edx
        movl %ebp, saved_context_ebp
        movl %esi, saved_context_esi
        movl %edi, saved_context_edi
        pushfl ; popl saved_context_eflags
 
-       call do_magic_suspend_2
-       popl %ebx
+       call swsusp_save
        ret
 
-resume:
-       movl $swsusp_pg_dir-__PAGE_OFFSET,%ecx
-       movl %ecx,%cr3
+ENTRY(restore_image)
+       movl    resume_pg_dir, %ecx
+       subl    $__PAGE_OFFSET, %ecx
+       movl    %ecx, %cr3
+
+       movl    restore_pblist, %edx
+       .p2align 4,,7
 
-       call do_magic_resume_1
-       movl $0,loop
-       cmpl $0,nr_copy_pages
-       je copy_done
 copy_loop:
-       movl $0,loop2
+       testl   %edx, %edx
+       jz      done
+
+       movl    pbe_address(%edx), %esi
+       movl    pbe_orig_address(%edx), %edi
+
+       movl    $1024, %ecx
+       rep
+       movsl
+
+       movl    pbe_next(%edx), %edx
+       jmp     copy_loop
        .p2align 4,,7
-copy_one_page:
-       movl pagedir_nosave,%ecx
-       movl loop,%eax
-       movl loop2,%edx
-       sall $4,%eax
-       movl 4(%ecx,%eax),%ebx
-       movl (%ecx,%eax),%eax
-       movb (%edx,%eax),%al
-       movb %al,(%edx,%ebx)
-
-       movl loop2,%eax
-       leal 1(%eax),%edx
-       movl %edx,loop2
-       movl %edx,%eax
-       cmpl $4095,%eax
-       jbe copy_one_page
-       movl loop,%eax
-       leal 1(%eax),%edx
-       movl %edx,loop
-       movl %edx,%eax
-       cmpl nr_copy_pages,%eax
-       jb copy_loop
-
-copy_done:
-       movl $__USER_DS,%eax
-
-       movw %ax, %ds
-       movw %ax, %es
+
+done:
+       /* go back to the original page tables */
+       movl    $swapper_pg_dir, %ecx
+       subl    $__PAGE_OFFSET, %ecx
+       movl    %ecx, %cr3
+       /* Flush TLB, including "global" things (vmalloc) */
+       movl    mmu_cr4_features, %eax
+       movl    %eax, %edx
+       andl    $~(1<<7), %edx;  # PGE
+       movl    %edx, %cr4;  # turn off PGE
+       movl    %cr3, %ecx;  # flush TLB
+       movl    %ecx, %cr3
+       movl    %eax, %cr4;  # turn PGE back on
+
        movl saved_context_esp, %esp
        movl saved_context_ebp, %ebp
-       movl saved_context_eax, %eax
        movl saved_context_ebx, %ebx
-       movl saved_context_ecx, %ecx
-       movl saved_context_edx, %edx
        movl saved_context_esi, %esi
        movl saved_context_edi, %edi
-       call restore_processor_state
+
        pushl saved_context_eflags ; popfl
-       call do_magic_resume_2
-       popl %ebx
-       ret
 
-       .section .data.nosave
-loop:
-       .quad 0
-loop2:
-       .quad 0
-       .previous
+       xorl    %eax, %eax
+
+       ret