From dc985e047a0e7dc35b5dc811eb4bffa852432c44 Mon Sep 17 00:00:00 2001 From: Mike Larkin Date: Mon, 10 Mar 2014 05:03:51 +0000 Subject: acpi_saved_rsp was defined twice. The asm resume code was using the first definition and the C part of the resume code was using the second. This manifested itself as mysterious reboot and stack corruption problems on resume. ok deraadt@ --- sys/arch/amd64/amd64/acpi_wakecode.S | 4 +--- 1 file changed, 1 insertion(+), 3 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 c9b264edd49..8bf022ce592 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.27 2014/02/01 07:10:33 mlarkin Exp $ */ +/* $OpenBSD: acpi_wakecode.S,v 1.28 2014/03/10 05:03:50 mlarkin Exp $ */ /* * Copyright (c) 2001 Takanori Watanabe * Copyright (c) 2001 Mitsuru IWASAKI @@ -644,8 +644,6 @@ _ACPI_TRMP_LABEL(acpi_saved_rdi) .quad 0 _ACPI_TRMP_LABEL(acpi_saved_rsp) .quad 0 -_ACPI_TRMP_LABEL(acpi_saved_rsp) - .quad 0 _ACPI_TRMP_LABEL(acpi_saved_r8) .quad 0 _ACPI_TRMP_LABEL(acpi_saved_r9) -- cgit v1.2.3