From 7902f2b0d6bfcc698ae8d283c885e1c7362d6614 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Sun, 14 Dec 2014 05:04:49 +0000
Subject: [PATCH] Disable MWAIT again, this time on both i386 and amd64.  Too
 many systems run excessively hot with it to have it on by default, and I
 still don't have good logic to let acpicpu enable it when the AML says it's
 good.

---
 sys/arch/amd64/amd64/cpu.c | 4 +++-
 sys/arch/i386/i386/cpu.c   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c
index 641dea3e655..449161c4a6b 100644
--- a/sys/arch/amd64/amd64/cpu.c
+++ b/sys/arch/amd64/amd64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.72 2014/12/12 16:51:32 tedu Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.73 2014/12/14 05:04:49 guenther Exp $	*/
 /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
 
 /*-
@@ -359,6 +359,8 @@ cpu_init_mwait(struct cpu_softc *sc)
 	else
 		mwait_size = largest;
 	printf("\n");
+	/* XXX disable mwait: ACPI says not to use it on too many systems */
+	mwait_size = 0;
 }
 
 void
diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c
index 728fa81efb9..9c99e8c0df3 100644
--- a/sys/arch/i386/i386/cpu.c
+++ b/sys/arch/i386/i386/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.57 2014/11/16 12:30:57 deraadt Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.58 2014/12/14 05:04:49 guenther Exp $	*/
 /* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
 
 /*-
@@ -833,6 +833,8 @@ cpu_init_mwait(struct device *dv)
 	else
 		mwait_size = largest;
 	printf("\n");
+	/* XXX disable mwait: ACPI says not to use it on too many systems */
+	mwait_size = 0;
 }
 
 void
-- 
2.20.1