From: bluhm <bluhm@openbsd.org>
Date: Mon, 22 Jun 2015 20:06:11 +0000 (+0000)
Subject: Add an #ifdef HIBERNATE to allow to build a kernel without hibernate but
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=19ca0f69b311571c30613ed3ae2d200f9a6c6e4b;p=openbsd

Add an #ifdef HIBERNATE to allow to build a kernel without hibernate but
with acpi.
OK mlarkin@
---

diff --git a/sys/arch/amd64/amd64/acpi_wakecode.S b/sys/arch/amd64/amd64/acpi_wakecode.S
index ab2903b4aa3..0f2626476a8 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.35 2014/12/08 07:12:37 mlarkin Exp $ */
+/* $OpenBSD: acpi_wakecode.S,v 1.36 2015/06/22 20:06:11 bluhm Exp $ */
 /*
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
@@ -627,12 +627,14 @@ _ACPI_TRMP_DATA_LABEL(acpi_saved_sfmask)
 	.align 4
 _ACPI_TRMP_DATA_LABEL(acpi_pdirpa)
 	.long 0
+#ifdef HIBERNATE
 _ACPI_TRMP_DATA_LABEL(hibernate_indirect_16)
 	.long	hibernate_resume_vector_3
 	.word	0x18
 _ACPI_TRMP_DATA_LABEL(hibernate_indirect_16b)
 	.long	hibernate_resume_vector_3b
 	.word	0x18
+#endif /* HIBERNATE */
 
 _C_LABEL(acpi_tramp_data_end):