From 646b6c65c5491b5d5647af2d635bf4137ae84c2b Mon Sep 17 00:00:00 2001
From: dogcow <dogcow@NetBSD.org>
Date: Mon, 10 Dec 2007 03:12:46 +0000
Subject: [PATCH] sometimes we don't have MTRR. (thanks, taca!)

---
 sys/arch/i386/acpi/acpi_wakeup.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/arch/i386/acpi/acpi_wakeup.c b/sys/arch/i386/acpi/acpi_wakeup.c
index a81831b7fb0c..128c62911886 100644
--- a/sys/arch/i386/acpi/acpi_wakeup.c
+++ b/sys/arch/i386/acpi/acpi_wakeup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_wakeup.c,v 1.41 2007/12/09 20:27:44 jmcneill Exp $	*/
+/*	$NetBSD: acpi_wakeup.c,v 1.42 2007/12/10 03:12:46 dogcow Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2007/12/09 20:27:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.42 2007/12/10 03:12:46 dogcow Exp $");
 
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
@@ -78,6 +78,8 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2007/12/09 20:27:44 jmcneill Ex
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_page.h>
 
+#include "opt_mtrr.h"
+
 #include "ioapic.h"
 #include "lapic.h"
 
@@ -313,8 +315,10 @@ out:
 	x86_enable_intr();
 	splx(s);
 
+#ifdef MTRR
 	if (mtrr_funcs != NULL)
 		mtrr_commit();
+#endif
 
 	return (ret);
 #undef WAKECODE_FIXUP