summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2018-06-21 07:33:31 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2018-06-21 07:33:31 +0000
commit3a21859a0c4c8bde27939cc91e4704e1d67f0ee5 (patch)
treee303583096d20924446c53b981eb1b939c923f44 /sys/arch/i386/include
parent0b2de1b550db093ace9067015042a01d0d2d0e44 (diff)
Save and restore retguard area during hibernate unpack. This copies the
original retguard data to the piglet and bcopys it back in place immediately before resuming via the ACPI Sx trampoline. ok deraadt, guenther, tested by many.
Diffstat (limited to 'sys/arch/i386/include')
-rw-r--r--sys/arch/i386/include/hibernate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/include/hibernate.h b/sys/arch/i386/include/hibernate.h
index f170ed82992..6448e7dd902 100644
--- a/sys/arch/i386/include/hibernate.h
+++ b/sys/arch/i386/include/hibernate.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hibernate.h,v 1.9 2014/05/31 06:30:16 mlarkin Exp $ */
+/* $OpenBSD: hibernate.h,v 1.10 2018/06/21 07:33:30 mlarkin Exp $ */
/*
* Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org>
@@ -26,7 +26,7 @@ void hibernate_enter_resume_mapping(vaddr_t, paddr_t, int);
int hibernate_inflate_skip(union hibernate_info *, paddr_t);
int hibernate_suspend(void);
void hibernate_switch_stack_machdep(void);
-void hibernate_resume_machdep(void);
+void hibernate_resume_machdep(vaddr_t);
void hibernate_activate_resume_pt_machdep(void);
void hibernate_enable_intr_machdep(void);
void hibernate_disable_intr_machdep(void);