From faf55aaa9bd0c608d18e9a3472c415ce0aecaa00 Mon Sep 17 00:00:00 2001 From: Mike Larkin Date: Thu, 17 Jan 2013 00:54:49 +0000 Subject: use .quad for gdt load when returning from long mode. Fixes a reboot problem after unpack --- sys/arch/amd64/amd64/acpi_wakecode.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/arch/amd64') diff --git a/sys/arch/amd64/amd64/acpi_wakecode.S b/sys/arch/amd64/amd64/acpi_wakecode.S index 3c1fe70a58b..466535dd8f8 100644 --- a/sys/arch/amd64/amd64/acpi_wakecode.S +++ b/sys/arch/amd64/amd64/acpi_wakecode.S @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_wakecode.S,v 1.15 2013/01/17 00:11:24 mlarkin Exp $ */ +/* $OpenBSD: acpi_wakecode.S,v 1.16 2013/01/17 00:54:48 mlarkin Exp $ */ /* * Copyright (c) 2001 Takanori Watanabe * Copyright (c) 2001 Mitsuru IWASAKI @@ -571,7 +571,7 @@ _ACPI_TRMP_LABEL(tmp_gdt64_end) .align 8 _ACPI_TRMP_LABEL(tmp_gdt6416) .word tmp_gdt6416_end - tmp_gdtable6416 - .long tmp_gdtable6416 + .quad tmp_gdtable6416 .align 8 _ACPI_TRMP_LABEL(tmp_gdtable6416) -- cgit v1.2.3