summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2012-07-13 14:43:29 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2012-07-13 14:43:29 +0000
commit50a0239d8564526d723df9c4da4b14e0573dc2bb (patch)
treeb17410602e7c28338d34d031cbae9d980e3fece7 /sys/arch
parentea6da2f265c755966e69cbed9aa946f2b6b4770a (diff)
Make amd64 look like i386 for hibernate resume
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/autoconf.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c
index 5b775dd1266..4cab84c0534 100644
--- a/sys/arch/amd64/amd64/autoconf.c
+++ b/sys/arch/amd64/amd64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.37 2010/11/18 21:13:16 miod Exp $ */
+/* $OpenBSD: autoconf.c,v 1.38 2012/07/13 14:43:28 mlarkin Exp $ */
/* $NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*-
@@ -58,6 +58,7 @@
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/timeout.h>
+#include <sys/hibernate.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -211,6 +212,10 @@ diskconf(void)
setroot(bootdv, part, RB_USERREQ);
dumpconf();
+
+#ifdef HIBERNATE
+ hibernate_resume();
+#endif /* HIBERNATE */
}
struct nam2blk nam2blk[] = {