diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-27 18:24:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-27 18:24:09 +0000 |
| commit | acd7a0bf17209170c8272ad477ada66994476a93 (patch) | |
| tree | d8e3c73de23e8cb88391fe8752dc580dbf102692 /sys/arch/amd64 | |
| parent | e6be00a1f2245bf2af1fee503800661098162d39 (diff) | |
hibernate_free() should not be called from MD code, acpi_sleep_state()
unwinds that. Upon hibernate fail, this was a collection of double-frees..
ok claudio mlarkin
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_machdep.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index 2a3f44c3e05..bcb711dd164 100644 --- a/sys/arch/amd64/amd64/acpi_machdep.c +++ b/sys/arch/amd64/amd64/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.76 2016/07/15 22:05:40 tom Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.77 2017/03/27 18:24:08 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -397,7 +397,6 @@ acpi_sleep_cpu(struct acpi_softc *sc, int state) if (hibernate_suspend()) { printf("%s: hibernate_suspend failed", DEVNAME(sc)); - hibernate_free(); return (ECANCELED); } } |