PM: Integrate beeping flag with existing acpi_sleep flags

[linux-2.6-omap-h63xx.git] / arch / i386 / kernel / acpi / wakeup.S

diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index b4e2ec3c39284308d2f1111327474902169b6281..ed0a0f2c1597a8b739f28081850c3f8b5b8c6248 100644 (file)
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -47,7 +47,7 @@ wakeup_code:
        movw    %ax, %ds                                        # Make ds:0 point to wakeup_start
        movw    %ax, %ss
 
-       testl   $1, beep_flags - wakeup_code
+       testl   $4, realmode_flags - wakeup_code
        jz      1f
        BEEP
 1:
@@ -61,7 +61,7 @@ wakeup_code:
        cmpl    $0x12345678, %eax
        jne     bogus_real_magic
 
-       testl   $1, video_flags - wakeup_code
+       testl   $1, realmode_flags - wakeup_code
        jz      1f
        lcall   $0xc000,$3
        movw    %cs, %ax
@@ -69,7 +69,7 @@ wakeup_code:
        movw    %ax, %ss
 1:
 
-       testl   $2, video_flags - wakeup_code
+       testl   $2, realmode_flags - wakeup_code
        jz      1f
        mov     video_mode - wakeup_code, %ax
        call    mode_set
@@ -108,11 +108,11 @@ wakeup_code:
        cmpl    $0x12345678, %eax
        jne     bogus_real_magic
 
-       testl   $2, beep_flags - wakeup_code
+       testl   $8, realmode_flags - wakeup_code
        jz      1f
        BEEP
 1:
-       ljmpl   $__KERNEL_CS,$wakeup_pmode_return
+       ljmpl   $__KERNEL_CS, $wakeup_pmode_return
 
 real_save_gdt: .word 0
                .long 0
@@ -121,7 +121,7 @@ real_save_cr3:      .long 0
 real_save_cr4: .long 0
 real_magic:    .long 0
 video_mode:    .long 0
-video_flags:   .long 0
+realmode_flags:        .long 0
 beep_flags:    .long 0
 real_efer_save_restore:        .long 0
 real_save_efer_edx:    .long 0
@@ -285,10 +285,8 @@ ENTRY(acpi_copy_wakeup_routine)
 
        movl    saved_videomode, %edx
        movl    %edx, video_mode - wakeup_start (%eax)
-       movl    acpi_video_flags, %edx
-       movl    %edx, video_flags - wakeup_start (%eax)
-       movl    s2ram_beep, %edx
-       movl    %edx, beep_flags - wakeup_start (%eax)
+       movl    acpi_realmode_flags, %edx
+       movl    %edx, realmode_flags - wakeup_start (%eax)
        movl    $0x12345678, real_magic - wakeup_start (%eax)
        movl    $0x12345678, saved_magic
        popl    %ebx