diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2016-05-16 01:19:28 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2016-05-16 01:19:28 +0000 |
| commit | edf8efab5fa26c4bc105d8c6e9805a7b7156e014 (patch) | |
| tree | f6fcae4bc68cafa593fee4b120c0a869e29e7d30 /sys/arch/i386 | |
| parent | aa94d813ac15b199cd5c03e8d728522b43e8c562 (diff) | |
Use int3 padding instead of nop in the ACPI resume trampoline, as it is
certain no intentional nop sled is required here.
ok deraadt@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/acpi_wakecode.S | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/i386/i386/acpi_wakecode.S b/sys/arch/i386/i386/acpi_wakecode.S index 5cd7170b607..ae21ed92fec 100644 --- a/sys/arch/i386/i386/acpi_wakecode.S +++ b/sys/arch/i386/i386/acpi_wakecode.S @@ -81,7 +81,7 @@ .text .code16 - .align 4 + .align 4, 0xcc .global _C_LABEL(acpi_real_mode_resume) .global _C_LABEL(acpi_protected_mode_resume) .global _C_LABEL(acpi_resume_end) @@ -159,7 +159,7 @@ _ACPI_TRMP_OFFSET(acpi_s3_vector_real) ljmpl $0x8, $acpi_protected_mode_trampoline .code32 - .align 16 + .align 16, 0xcc _ACPI_TRMP_LABEL(acpi_protected_mode_trampoline) _C_LABEL(acpi_protected_mode_resume): nop @@ -401,12 +401,12 @@ NENTRY(hibernate_flush) #endif /* HIBERNATE */ .code16 - .align 8 + .align 8, 0xcc _ACPI_TRMP_OFFSET(tmp_gdt) .word tmp_gdt_end - tmp_gdtable .long tmp_gdtable - .align 8 + .align 8, 0xcc _ACPI_TRMP_LABEL(tmp_gdtable) /* * null @@ -446,7 +446,7 @@ _ACPI_TRMP_LABEL(tmp_gdtable) .byte 0, 0x93, 0xcf, 0 _ACPI_TRMP_LABEL(tmp_gdt_end) - .align 8 + .align 8, 0xcc _ACPI_TRMP_OFFSET(clean_idt) .word 0xffff .long 0 @@ -456,12 +456,12 @@ _ACPI_TRMP_OFFSET(clean_idt) * gdt_16 is the gdt used when returning to real mode for bios * reads/writes (sets up a 16 bit segment) */ - .align 8 + .align 8, 0xcc _ACPI_TRMP_LABEL(gdt_16) .word gdt_16_end - gdt_16_table .long gdt_16_table - .align 8 + .align 8, 0xcc _ACPI_TRMP_LABEL(gdt_16_table) /* * null @@ -502,7 +502,7 @@ _ACPI_TRMP_LABEL(gdt_16_table) _ACPI_TRMP_LABEL(gdt_16_end) - .align 4 + .align 4, 0xcc _ACPI_TRMP_LABEL(acpi_saved_ebx) .long 0 _ACPI_TRMP_LABEL(acpi_saved_ecx) @@ -530,15 +530,15 @@ _ACPI_TRMP_LABEL(acpi_saved_cr4) _ACPI_TRMP_LABEL(acpi_saved_ret) .long 0 - .align 16 + .align 16, 0xcc _ACPI_TRMP_LABEL(acpi_saved_idt) .space 6 - .align 16 + .align 16, 0xcc _ACPI_TRMP_LABEL(acpi_saved_gdt) .space 6 - .align 16 + .align 16, 0xcc _ACPI_TRMP_LABEL(acpi_saved_ldt) .short 0 _ACPI_TRMP_LABEL(acpi_saved_cs) |