- update to 2.6.1-rc2 -- first cut.

[linux-flexiantxendom0-3.2.10.git] / arch / x86_64 / kernel / acpi / wakeup.S

diff --git a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86_64/kernel/acpi/wakeup.S
index b388b58..f7f8515 100644 (file)
--- a/arch/x86_64/kernel/acpi/wakeup.S
+++ b/arch/x86_64/kernel/acpi/wakeup.S
@@ -41,19 +41,7 @@ wakeup_code:
        cmpl    $0x12345678, %eax
        jne     bogus_real_magic
 
-       testl   $1, video_flags - wakeup_code
-       jz      1f
        lcall   $0xc000,$3
-       movw    %cs, %ax
-       movw    %ax, %ds                                        # Bios might have played with that
-       movw    %ax, %ss
-1:
-
-       testl   $2, video_flags - wakeup_code
-       jz      1f
-       mov     video_mode - wakeup_code, %ax
-       call    mode_seta
-1:
 
        movw    $0xb800, %ax
        movw    %ax,%fs
@@ -262,7 +250,6 @@ real_save_gdt:      .word 0
                .quad 0
 real_magic:    .quad 0
 video_mode:    .quad 0
-video_flags:   .quad 0
 
 bogus_real_magic:
        movb    $0xba,%al       ;  outb %al,$0x80               
@@ -395,10 +382,8 @@ ENTRY(acpi_copy_wakeup_routine)
        movl    %eax, saved_efer
        movl    %edx, saved_efer2
 
-       movl    saved_video_mode, %edx
-       movl    %edx, video_mode - wakeup_start (,%rdi)
-       movl    acpi_video_flags, %edx
-       movl    %edx, video_flags - wakeup_start (,%rdi)
+#      movq    saved_videomode, %rdx                           # FIXME:         videomode
+       movq    %rdx, video_mode - wakeup_start (,%rdi)
        movq    $0x12345678, real_magic - wakeup_start (,%rdi)
        movq    $0x123456789abcdef0, %rdx
        movq    %rdx, saved_magic
@@ -430,6 +415,8 @@ do_suspend_lowlevel:
 .LFB5:
        subq    $8, %rsp
 .LCFI2:
+       testl   %edi, %edi
+       jne     .L99
        xorl    %eax, %eax
        call    save_processor_state